# # # patch "po/de.po" # from [20f62c198cfbb8bf10c4f9a810eb4d2486295444] # to [b063beb36c0c3d54077ca07cde13548e09f1696f] # # patch "po/es.po" # from [b23e8c853770550ef8a4a618a75c0d14ecf9b101] # to [65952dde24a2d0902d561c2b4fffc8c1a28c1093] # # patch "po/fr.po" # from [29845319eebe7b7e8add8a19ef41ea9773a53467] # to [c7f466da52c97eee89a2c0fc1f187ebdd63fbb42] # # patch "po/it.po" # from [34f197c5aebed81c45c64a413582066a15b50717] # to [fb9b071491843939ab2e6a762073d23cc5cef3db] # # patch "po/ja.po" # from [8f094a686a4c59a86202b127f910d0f6efbb0572] # to [9e1b79176947ef21a6eefc5f645440f8e2b9e94d] # # patch "po/pt_BR.po" # from [0b41fb4fffac11dbd63f66beeec927a5e0c8a615] # to [ccff69e42d620c1b0ca5e40023ab6b8b8f112324] # # patch "po/sv.po" # from [897d61be18aba7d6316298fbdc6a385f3e70de51] # to [ddee1f357db8fabf44594c114eee6ac7bed8c2b2] # ============================================================ --- po/de.po 20f62c198cfbb8bf10c4f9a810eb4d2486295444 +++ po/de.po b063beb36c0c3d54077ca07cde13548e09f1696f @@ -30,7 +30,7 @@ msgstr "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-13 23:13+0100\n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" "PO-Revision-Date: 2006-11-06 12:50+0100\n" "Last-Translator: Thomas Keller \n" "Language-Team: Deutsch \n" @@ -128,9 +128,9 @@ msgstr "REVISIONS_ID" msgstr "REVISIONS_ID" #: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 -#: cmd_db.cc:35 cmd_diff_log.cc:387 cmd_diff_log.cc:418 cmd_diff_log.cc:420 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 #: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 -#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:409 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "Revision nicht gefunden: '%s'" @@ -369,9 +369,9 @@ msgstr "keine Variable mit dem Namen %s msgid "no var with name %s in domain %s" msgstr "keine Variable mit dem Namen %s in der Domäne %s" -#: cmd_db.cc:155 cmd_diff_log.cc:333 cmd_diff_log.cc:559 cmd_files.cc:114 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 #: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 -#: commands.cc:271 +#: commands.cc:275 msgid "informative" msgstr "Informativ" @@ -388,13 +388,18 @@ msgstr "nicht-hexadezimale Zeichen in Te msgid "non-hex digits in partial id" msgstr "nicht-hexadezimale Zeichen in Teil-ID" -#: cmd_diff_log.cc:333 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 #: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[PFAD]..." # -#: cmd_diff_log.cc:334 +#: cmd_diff_log.cc:466 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -409,7 +414,7 @@ msgstr "" "beiden ausgegeben. Wenn kein Format angegeben\n" "wurde, wird standardmäßig 'unified' verwendet." -#: cmd_diff_log.cc:347 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -418,16 +423,21 @@ msgstr "" "--diff-args benötigt --external\n" "Fügen Sie --external hinzu oder entfernen Sie --diff-args." -#: cmd_diff_log.cc:479 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "keine Änderungen" -#: cmd_diff_log.cc:559 +#: cmd_diff_log.cc:520 +#, fuzzy +msgid "[FILE [...]]" +msgstr "[DATEI] ..." + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[DATEI] ..." # -#: cmd_diff_log.cc:560 +#: cmd_diff_log.cc:604 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -437,7 +447,7 @@ msgstr "" "Revisionen übergeben wurden, werden diese als\n" "Ausgangspunkt genutzt." -#: cmd_diff_log.cc:572 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "'--last' und '--next' sind nur einmal erlaubt" @@ -1696,53 +1706,53 @@ msgstr "aktualisiere den 'inodeprint'-Ca msgid "refresh the inodeprint cache" msgstr "aktualisiere den 'inodeprint'-Cache" -#: commands.cc:135 commands.cc:237 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "unbekanntes Kommando '%s'" -#: commands.cc:146 +#: commands.cc:150 #, c-format msgid "command '%s' has multiple ambiguous expansions:" msgstr "Das Kommando '%s' kann auf mehrere Arten erweitert werden:" -#: commands.cc:179 +#: commands.cc:183 msgid "commands:" msgstr "Kommandos:" -#: commands.cc:271 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "Kommando [ARGUMENTE...]" -#: commands.cc:272 +#: commands.cc:276 msgid "display command help" msgstr "zeige Hilfe für Kommando" -#: commands.cc:416 +#: commands.cc:420 #, c-format msgid "expanding selection '%s'" msgstr "expandiere Auswahl '%s'" -#: commands.cc:424 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "kein Treffer für Auswahl '%s'" -#: commands.cc:430 +#: commands.cc:434 #, c-format msgid "expanded to '%s'" msgstr "erweitert zu '%s'" -#: commands.cc:447 +#: commands.cc:451 #, c-format msgid "selection '%s' has multiple ambiguous expansions:" msgstr "Die Auswahl '%s' kann auf mehrere Arten erweitert werden:" -#: commands.cc:464 +#: commands.cc:468 msgid "note: " msgstr "Hinweis: " -#: commands.cc:465 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1751,7 +1761,7 @@ msgstr "" "Der Zweig '%s' hat mehrere Köpfe.\n" "Eventuell möchten Sie '%s merge' ausführen." -#: commands.cc:480 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message und --message-file können nicht zusammen verwendet werden" @@ -1927,7 +1937,8 @@ msgid "height of revision %s not greater #: database_check.cc:859 #, c-format msgid "height of revision %s not greater than that of parent" -msgstr "Höhenangabe für Revision %s ist nicht größer als die der Eltern-Revision" +msgstr "" +"Höhenangabe für Revision %s ist nicht größer als die der Eltern-Revision" #: database_check.cc:944 #, c-format ============================================================ --- po/es.po b23e8c853770550ef8a4a618a75c0d14ecf9b101 +++ po/es.po 65952dde24a2d0902d561c2b4fffc8c1a28c1093 @@ -54,7 +54,7 @@ msgstr "" msgstr "" "Project-Id-Version: Monotone\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-07 20:12+0100\n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" "PO-Revision-Date: 2006-11-07 09:30-0400\n" "Last-Translator: Nicolás Ruiz \n" "Language-Team: Nicolás Ruiz \n" @@ -98,7 +98,7 @@ msgstr "REV1 [REV2 [REV3 [...]]]" #: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330 #: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452 -#: automate.cc:1216 cmd_list.cc:662 +#: automate.cc:1216 cmd_list.cc:662 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "La revisión %s no existe" @@ -120,7 +120,7 @@ msgstr "REV_NUEVA [REV_VIEJA1 [REV_VIEJA msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "REV_NUEVA [REV_VIEJA1 [REV_VIEJA2 [...]]]" -#: automate.cc:423 automate.cc:447 cmd_list.cc:652 +#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 msgid "REV" msgstr "REV" @@ -152,9 +152,9 @@ msgstr "ID_REV" msgstr "ID_REV" #: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 -#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 #: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 -#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:409 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "la revisión '%s' no existe" @@ -325,6 +325,7 @@ msgstr "base de datos" msgstr "base de datos" #: cmd_db.cc:47 +#, fuzzy msgid "" "init\n" "info\n" @@ -339,7 +340,7 @@ msgid "" "check\n" "changesetify\n" "rosterify\n" -"regenerate_rosters\n" +"regenerate_caches\n" "set_epoch BRANCH EPOCH\n" msgstr "" "init\n" @@ -394,9 +395,9 @@ msgstr "ninguna variable tiene nombre %s msgid "no var with name %s in domain %s" msgstr "ninguna variable tiene nombre %s en el dominino %s" -#: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 #: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 -#: commands.cc:271 +#: commands.cc:275 msgid "informative" msgstr "informativo" @@ -413,12 +414,17 @@ msgstr "digitos no hexadecimales en el i msgid "non-hex digits in partial id" msgstr "digitos no hexadecimales en el identificador parcial" -#: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 #: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[CAMINO]..." -#: cmd_diff_log.cc:332 +#: cmd_diff_log.cc:466 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -431,7 +437,7 @@ msgstr "" "muestran las diferencias entre ambas revisiones. Si no se especifica\n" "formato, se utiliza formato unificado por omisión." -#: cmd_diff_log.cc:345 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -440,15 +446,20 @@ msgstr "" "--diff-args requiere --external\n" "pruebe agregando --external o eliminando --diff-args?" -#: cmd_diff_log.cc:477 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "no hay cambios" -#: cmd_diff_log.cc:541 +#: cmd_diff_log.cc:520 +#, fuzzy +msgid "[FILE [...]]" +msgstr "[ARCHIVO]..." + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[ARCHIVO]..." -#: cmd_diff_log.cc:542 +#: cmd_diff_log.cc:604 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -456,7 +467,7 @@ msgstr "" "imprime la historia en orden reverso (filtrado por 'ARCHIVO'). Si una\n" "o más revisiones son especificadas, se utilizan estas como punto de partida." -#: cmd_diff_log.cc:604 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "solo se permite una de las opciones --last/--next" @@ -1692,53 +1703,53 @@ msgstr "refresca el cache inodeprint" msgid "refresh the inodeprint cache" msgstr "refresca el cache inodeprint" -#: commands.cc:135 commands.cc:237 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "comando desconocido '%s'" -#: commands.cc:146 +#: commands.cc:150 #, c-format msgid "command '%s' has multiple ambiguous expansions:" msgstr "comando '%s' tiene múltiple expansiones ambiguas:" -#: commands.cc:179 +#: commands.cc:183 msgid "commands:" msgstr "comandos:" -#: commands.cc:271 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "comando [ARGUMENTOS...]" -#: commands.cc:272 +#: commands.cc:276 msgid "display command help" msgstr "muestra la ayuda del comando" -#: commands.cc:416 +#: commands.cc:420 #, c-format msgid "expanding selection '%s'" msgstr "expandiendo selección '%s'" -#: commands.cc:424 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "no hay concordancia para la selección '%s'" -#: commands.cc:430 +#: commands.cc:434 #, c-format msgid "expanded to '%s'" msgstr "expandido a '%s'" -#: commands.cc:447 +#: commands.cc:451 #, c-format msgid "selection '%s' has multiple ambiguous expansions:" msgstr "selección '%s' tiene múltiple expansiones ambiguas:" -#: commands.cc:464 +#: commands.cc:468 msgid "note: " msgstr "nota: " -#: commands.cc:465 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1747,70 +1758,78 @@ msgstr "" "rama '%s' tiene múltiples cabezas\n" "considere utilizar '%s merge'" -#: commands.cc:480 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "'--message' y '--message-file' son mutuamente exclusivos" -#: database_check.cc:129 +#: database_check.cc:137 #, c-format msgid "file structure is corrupted; cannot check further" msgstr "la estructura del archivo está corrupta; no puedo chequear más" -#: database_check.cc:140 +#: database_check.cc:148 msgid "files" msgstr "archivos" -#: database_check.cc:169 +#: database_check.cc:177 msgid "rosters" msgstr "rosters" -#: database_check.cc:227 +#: database_check.cc:235 msgid "markings" msgstr "marcas" -#: database_check.cc:298 netsync.cc:2969 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 msgid "revisions" msgstr "revisiones" -#: database_check.cc:393 +#: database_check.cc:401 msgid "ancestry" msgstr "ascendencia" -#: database_check.cc:426 netsync.cc:2973 +#: database_check.cc:434 netsync.cc:2973 msgid "keys" msgstr "llaves" -#: database_check.cc:452 +#: database_check.cc:460 msgid "certs" msgstr "certificados" -#: database_check.cc:489 +#: database_check.cc:504 +msgid "heights" +msgstr "" + +#: database_check.cc:548 +msgid "height relations" +msgstr "" + +#: database_check.cc:594 #, c-format msgid "file %s missing (%d manifest references)" msgstr "archivo %s faltante (%d referencias en el manifiesto)" -#: database_check.cc:496 +#: database_check.cc:601 #, c-format msgid "file %s unreferenced" msgstr "archivo %s sin referencias" -#: database_check.cc:515 +#: database_check.cc:620 #, c-format msgid "roster %s unreferenced" msgstr "roster %s sin referencias" -#: database_check.cc:521 +#: database_check.cc:626 #, c-format msgid "roster %s incomplete (%d missing files)" msgstr "roster %s incompleto (%d archivos faltantes)" -#: database_check.cc:528 +#: database_check.cc:633 #, c-format msgid "roster %s incomplete (%d missing revisions)" msgstr "roster %s incompleto (%d revisiones faltantes)" -#: database_check.cc:553 +#: database_check.cc:658 #, c-format msgid "" "revision %s missing (%d revision references; %d cert references; %d parent " @@ -1820,204 +1839,236 @@ msgstr "" "certificados; %d referencias a padres; %d referencias a rosters; %d " "referencias a rosters)" -#: database_check.cc:561 +#: database_check.cc:666 #, c-format msgid "revision %s incomplete (%d missing manifests)" msgstr "revisión %s incompleta (%d manifiestos faltantes)" -#: database_check.cc:568 +#: database_check.cc:673 #, c-format msgid "revision %s incomplete (%d missing revisions)" msgstr "revisión %s incompleta (%d revisiones faltantes)" -#: database_check.cc:575 +#: database_check.cc:680 #, c-format msgid "revision %s incomplete (missing roster)" msgstr "revisión %s incompleta (roster faltante)" -#: database_check.cc:581 +#: database_check.cc:686 #, c-format msgid "revision %s mismatched roster and manifest" msgstr "revisión %s no hay concordancia entre roster y manifiesto" -#: database_check.cc:587 +#: database_check.cc:692 #, c-format msgid "revision %s incomplete (incomplete roster)" msgstr "revisión %s incompleta (roster incompleto)" -#: database_check.cc:593 +#: database_check.cc:698 #, c-format msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)" msgstr "" "revisión %s padres no concordantes (%d padres en la ascendencia; %d " "referencias a revisiones)" -#: database_check.cc:602 +#: database_check.cc:707 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)" msgstr "" "revisión %s tiene hijos no concordantes (%d hijos en la ascendencia; %d " "padres)" -#: database_check.cc:614 +#: database_check.cc:719 #, c-format msgid "revision %s has bad history (%s)" msgstr "revisión %s tiene historia inválida (%s)" -#: database_check.cc:621 +#: database_check.cc:726 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)" msgstr "" "revisión %s no es sintácticamente válidda (quizas con caminos no " "normalizados?)" -#: database_check.cc:628 +#: database_check.cc:733 #, c-format msgid "revision %s is not in normalized form" msgstr "revisión %s no está en forma normalizada" -#: database_check.cc:652 +#: database_check.cc:757 #, c-format msgid "key %s missing (signed %d certs)" msgstr "llave %s faltante (%d certificados firmados)" -#: database_check.cc:685 +#: database_check.cc:790 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s" msgstr "" "revisión %s tiene firma no verificada en certificado %s por la llave " "faltante %s" -#: database_check.cc:693 +#: database_check.cc:798 #, c-format msgid "revision %s bad signature in %s cert from key %s" msgstr "revisión %s tiene firma incorrecta en certificado %s por la llave %s" -#: database_check.cc:708 +#: database_check.cc:813 #, c-format msgid "revision %s missing %s cert" msgstr "revisión %s le falta el certificado %s" -#: database_check.cc:717 +#: database_check.cc:822 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)" msgstr "" "revisión %s tiene certificados no concordantes (%d autores %d fechas %d " "changelogs)" -#: database_check.cc:797 +#: database_check.cc:846 +#, fuzzy, c-format +msgid "height missing for revision %s" +msgstr "%d revisiones faltantes" + +#: database_check.cc:853 +#, fuzzy, c-format +msgid "duplicate height for revision %s" +msgstr "actualizado a la revisión base %s" + +#: database_check.cc:859 #, c-format +msgid "height of revision %s not greater than that of parent" +msgstr "" + +#: database_check.cc:944 +#, c-format msgid "%d missing files" msgstr "%d archivos faltantes" -#: database_check.cc:799 +#: database_check.cc:946 #, c-format msgid "%d unreferenced files" msgstr "%d archivos no referenciados" -#: database_check.cc:802 +#: database_check.cc:949 #, c-format msgid "%d unreferenced rosters" msgstr "%d rosters no referenciados" -#: database_check.cc:804 +#: database_check.cc:951 #, c-format msgid "%d incomplete rosters" msgstr "%d rosters incompletos" -#: database_check.cc:807 +#: database_check.cc:954 #, c-format msgid "%d missing revisions" msgstr "%d revisiones faltantes" -#: database_check.cc:809 +#: database_check.cc:956 #, c-format msgid "%d incomplete revisions" msgstr "%d revisiones incompletas" -#: database_check.cc:811 +#: database_check.cc:958 #, c-format msgid "%d mismatched parents" msgstr "%d padres no concordantes" -#: database_check.cc:813 +#: database_check.cc:960 #, c-format msgid "%d mismatched children" msgstr "%d hijos no concordantes" -#: database_check.cc:815 +#: database_check.cc:962 #, c-format msgid "%d revisions with bad history" msgstr "%d revisiones con historia incorrecta" -#: database_check.cc:817 +#: database_check.cc:964 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)" msgstr "%d revisiones no analizables (quizas tengan caminos inválidos)" -#: database_check.cc:820 +#: database_check.cc:967 #, c-format msgid "%d revisions not in normalized form" msgstr "%d revisiones no estan en forma normalizada" -#: database_check.cc:824 +#: database_check.cc:971 #, c-format msgid "%d missing rosters" msgstr "%d rosters faltantes" -#: database_check.cc:828 +#: database_check.cc:975 #, c-format msgid "%d missing keys" msgstr "%d llaves faltantes" -#: database_check.cc:831 +#: database_check.cc:978 #, c-format msgid "%d missing certs" msgstr "%d certificados faltantes" -#: database_check.cc:833 +#: database_check.cc:980 #, c-format msgid "%d mismatched certs" msgstr "%d certificados no concordantes" -#: database_check.cc:835 +#: database_check.cc:982 #, c-format msgid "%d unchecked signatures due to missing keys" msgstr "%d firmas no verificadas debido a llaves faltantes" -#: database_check.cc:837 +#: database_check.cc:984 #, c-format msgid "%d bad signatures" msgstr "%d firmas incorrectas" -#: database_check.cc:861 +#: database_check.cc:987 +#, fuzzy, c-format +msgid "%d missing heights" +msgstr "%d certificados faltantes" + +#: database_check.cc:989 #, c-format -msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs" +msgid "%d duplicate heights" msgstr "" + +#: database_check.cc:991 +#, fuzzy, c-format +msgid "%d incorrect heights" +msgstr "%d revisiones incompletas" + +#: database_check.cc:1017 +#, fuzzy, c-format +msgid "" +"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d " +"heights" +msgstr "" "chequeo completo: %d archivos; %d rosters; %d revisiones; %d llaves, %d " "certificados" -#: database_check.cc:867 +#: database_check.cc:1024 #, c-format msgid "total problems detected: %d (%d serious)" msgstr "total de problemas detectados: %d (%d serios)" -#: database_check.cc:869 +#: database_check.cc:1026 #, c-format msgid "serious problems detected" msgstr "problemas serios detectados" -#: database_check.cc:871 +#: database_check.cc:1028 #, c-format msgid "minor problems detected" msgstr "problemas menores detectados" -#: database_check.cc:873 +#: database_check.cc:1030 #, c-format msgid "database is good" msgstr "base de datos está bien" -#: database.cc:158 +#: database.cc:159 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -2031,12 +2082,12 @@ msgstr "" "pruebe '%s db migrate' para actualizarla\n" "(esto es irreversible, primero haga una copia de seguridad)" -#: database.cc:172 +#: database.cc:173 #, c-format msgid "this database already contains rosters" msgstr "esta base de datos ya contiene rosters" -#: database.cc:196 +#: database.cc:200 #, c-format msgid "" "database %s contains old-style revisions\n" @@ -2055,7 +2106,7 @@ msgstr "" " hale la data a una nueva base de datos.\n" "disculpe por el inconveniente." -#: database.cc:206 +#: database.cc:210 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -2066,31 +2117,30 @@ msgstr "" "esta es una base de datos muy vieja; necesita ser actualizada\n" "por favor lea los detalles en README.changesets" -#: database.cc:217 -#, c-format +#: database.cc:221 +#, fuzzy, c-format msgid "" -"database %s contains revisions but no rosters\n" -"probably this is because an upgrade cleared the roster cache\n" -"run '%s db regenerate_rosters' to restore use of this database" +"database %s misses some cached data\n" +"run '%s db regenerate_caches' to restore use of this database" msgstr "" "base de datos %s contiene revisiones pero no rosters\n" "probablemente esto es porque una actualización limpió el cache de rosters\n" "ejecute '%s db regenerate_rosters' para restablecer el uso de esta base de " "datos" -#: database.cc:256 +#: database.cc:259 #, c-format msgid "unable to probe database version in file %s" msgstr "incapaz de determinar la versión de la base de datos en el archivo %s" -#: database.cc:263 +#: database.cc:266 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" "base de datos %s no es un archivo sqlite versión 3,\n" "intente un 'dump' y 'reload'" -#: database.cc:290 schema_migration.cc:201 +#: database.cc:293 schema_migration.cc:201 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -2098,7 +2148,7 @@ msgstr "" "asegurese que la base de datos y el directorio que la contiene tengan\n" "permiso de escritura y que no se haya quedado sin espacio en disco" -#: database.cc:294 schema_migration.cc:206 +#: database.cc:297 schema_migration.cc:206 #, c-format msgid "" "sqlite error: %s\n" @@ -2107,12 +2157,12 @@ msgstr "" "error sqlite: %s\n" "%s" -#: database.cc:339 +#: database.cc:342 #, c-format msgid "could not initialize database: %s: already exists" msgstr "no puede inicializar la base de datos: %s: ya existe" -#: database.cc:344 +#: database.cc:347 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2123,13 +2173,13 @@ msgstr "" "raiz que la nueva base de datos '%s'\n" "cancelando la creación de la base de datos" -#: database.cc:494 +#: database.cc:497 #, c-format msgid "cannot create %s; it already exists" msgstr "no puede crear %s; ya existe" -#: database.cc:571 -#, c-format +#: database.cc:574 +#, fuzzy, c-format msgid "" "schema version : %s\n" "counts:\n" @@ -2149,6 +2199,7 @@ msgid "" " revisions : %u\n" " cached ancestry : %u\n" " certs : %u\n" +" heights : %u\n" " total : %u\n" "database:\n" " page size : %u\n" @@ -2177,52 +2228,52 @@ msgstr "" " tamaño de página : %u\n" " tamaño del cache : %u" -#: database.cc:634 +#: database.cc:639 #, c-format msgid "database schema version: %s" msgstr "versión del esquema de la base de datos: %s" -#: database.cc:711 +#: database.cc:716 #, c-format msgid "multiple statements in query: %s" msgstr "múltiples statements en el query: %s" -#: database.cc:717 +#: database.cc:722 #, c-format msgid "wanted %d columns got %d in query: %s" msgstr "queria %d columnas y obtuvo %d en el query: %s" -#: database.cc:783 +#: database.cc:788 #, c-format msgid "null result in query: %s" msgstr "resultado nulo en el query: %s" -#: database.cc:801 +#: database.cc:806 #, c-format msgid "wanted %d rows got %d in query: %s" msgstr "queria %d filas y obtuvo %d en el query: %s" -#: database.cc:1948 +#: database.cc:2040 #, c-format msgid "another key with name '%s' already exists" msgstr "ya existe otra llave con nombre '%s'" -#: database.cc:2945 +#: database.cc:3037 #, c-format msgid "no database specified" msgstr "no se especificó base de datos" -#: database.cc:2953 +#: database.cc:3045 #, c-format msgid "database %s does not exist" msgstr "base de datos %s inexistente" -#: database.cc:2954 +#: database.cc:3046 #, c-format msgid "%s is a directory, not a database" msgstr "%s es un directorio, no una base de datos" -#: database.cc:2979 +#: database.cc:3071 #, c-format msgid "could not open database '%s': %s" msgstr "no puede abrir base de datos '%s': %s" @@ -3338,49 +3389,49 @@ msgstr "etiquetas" msgid "tags" msgstr "etiquetas" -#: revision.cc:865 +#: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" msgstr "buscando aristas de 'merge' incorrectos" -#: revision.cc:907 +#: revision.cc:883 #, c-format msgid "optimizing out redundant edge %d -> %d" msgstr "removiendo aristas redundantes %d -> %d" -#: revision.cc:916 +#: revision.cc:892 #, c-format msgid "failed to eliminate edge %d -> %d" msgstr "falla en la eliminación de arista %d -> %d" -#: revision.cc:927 +#: revision.cc:903 #, c-format msgid "rebuilding %d nodes" msgstr "reconstruyendo %d nodos" -#: revision.cc:1132 +#: revision.cc:1108 #, c-format msgid "Path %s added to child roster multiple times" msgstr "Camino %s agregado al roster hijo múltiples veces" -#: revision.cc:1145 +#: revision.cc:1121 #, c-format msgid "Directory for path %s cannot be added, as there is a file in the way" msgstr "" "Directorio para el camino %s no puede ser agregado, hay un archivo en el " "camino" -#: revision.cc:1156 +#: revision.cc:1132 #, c-format msgid "Path %s cannot be added, as there is a directory in the way" msgstr "Camino %s no puede ser agregado, hay un directorio en el camino" -#: revision.cc:1159 +#: revision.cc:1135 #, c-format msgid "Path %s added twice with differing content" msgstr "Camino %s agregado dos veces con contenido diferente" -#: revision.cc:1446 +#: revision.cc:1422 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3393,36 +3444,41 @@ msgstr "" "(si solamente quiere eliminarlo, use el argumento '--drop-attr', pero\n" "si realmente quiere mantener el atributo, lo podemos ayudar)" -#: revision.cc:1559 +#: revision.cc:1535 #, c-format msgid "converting existing revision graph to new roster-style revisions" msgstr "" "convirtiendo el grafo de revisiones existentes a las nuevas revisiones con " "rosters" -#: revision.cc:1614 +#: revision.cc:1590 #, c-format msgid "rebuilding revision graph from manifest certs" msgstr "" "reconstruyendo el grafo de revisiones a partir de los certificados de " "manifiestos" -#: revision.cc:1647 -#, c-format -msgid "regenerating cached rosters" +#: revision.cc:1668 +#, fuzzy, c-format +msgid "regenerating cached rosters and heights" msgstr "regenerando los rosters en cache" -#: revision.cc:1656 -#, c-format -msgid "calculating rosters to regenerate" -msgstr "calculando los rosters a regenerar" - -#: revision.cc:1660 +#: revision.cc:1680 msgid "regenerated" msgstr "regenerado" +#: revision.cc:1696 +#, fuzzy, c-format +msgid "finished regenerating cached rosters and heights" +msgstr "regenerando los rosters en cache" + +#: revision.cc:1708 +#, c-format +msgid "cached height: %s" +msgstr "" + # TODO: Use a variable here instead of hardwire "version '1'" -#: revision.cc:1755 +#: revision.cc:1791 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3525,10 +3581,10 @@ msgstr "" "ejecutar '%s db %s'" #: schema_migration.cc:339 -#, c-format +#, fuzzy, c-format msgid "" -"NOTE: this upgrade cleared the roster cache\n" -"you should now run '%s db regenerate_rosters'" +"NOTE: this upgrade cleared monotone's caches\n" +"you should now run '%s db regenerate_caches'" msgstr "" "NOTA: esta actualización limpió el cache de rosters\n" "ud. debe ahora ejecutar '%s db regenerate_rosters'" @@ -3949,3 +4005,6 @@ msgstr "esta área de trabajo está en e #, c-format msgid "this workspace is in the current format, no migration is necessary." msgstr "esta área de trabajo está en el formato actual, no es necesario migrar" + +#~ msgid "calculating rosters to regenerate" +#~ msgstr "calculando los rosters a regenerar" ============================================================ --- po/fr.po 29845319eebe7b7e8add8a19ef41ea9773a53467 +++ po/fr.po c7f466da52c97eee89a2c0fc1f187ebdd63fbb42 @@ -242,8 +242,8 @@ msgstr "" msgid "" msgstr "" "Project-Id-Version: monotone 0.28\n" -"Report-Msgid-Bugs-To: address@hidden" -"POT-Creation-Date: 2006-09-25 22:39+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" "PO-Revision-Date: 2006-09-22 23:40+0200\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" @@ -252,640 +252,198 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../app_state.cc:151 +#: app_state.cc:129 #, c-format msgid "workspace required but not found%s%s" msgstr "espace de travail requis mais pas trouvé%s%s" -#: ../app_state.cc:159 +#: app_state.cc:137 #, c-format msgid "invalid directory ''" msgstr "dossier pas valable «»" -#: ../app_state.cc:167 +#: app_state.cc:145 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "le dossier administratif de monotone « %s » existe déjà dans « %s »" -#: ../app_state.cc:245 +#: app_state.cc:201 #, c-format msgid "search root '%s' does not exist" msgstr "le racine de l'espace de travail « %s » n'existe pas" -#: ../app_state.cc:246 -#, c-format -msgid "search root '%s' is not a directory\n" +#: app_state.cc:202 +#, fuzzy, c-format +msgid "search root '%s' is not a directory" msgstr "le racine de l'espace de travail « %s » n'est pas un dossier\n" -#: ../app_state.cc:280 -#, c-format -msgid "failed to parse date string '%s': %s" -msgstr "échou de comprendre la date « %s » : %s" - -#: ../app_state.cc:295 -#, c-format -msgid "negative depth not allowed\n" -msgstr "profondeur négative interdite\n" - -#: ../app_state.cc:303 -#, c-format -msgid "illegal argument to --last: cannot be zero or negative\n" -msgstr "argument illégal à --last : il ne doit pas être nul ou négatif\n" - -#: ../app_state.cc:311 -#, c-format -msgid "illegal argument to --next: cannot be zero or negative\n" -msgstr "argument illégal à --next : il ne pas être nul ou négatif\n" - -#: ../app_state.cc:388 -#, c-format -msgid "illegal argument to --automate-stdio-size: cannot be zero or negative\n" -msgstr "" -"argument illégal à --automate-stdio-size : il ne doit pas être nul ou " -"négatif\n" - -#. Name: heads -#. Arguments: -#. 1: branch name (optional, default branch is used if non-existant) -#. Added in: 0.0 -#. Purpose: Prints the heads of the given branch. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: If the branch does not exist, prints nothing. (There are -#. no heads.) -#: ../automate.cc:65 +#: automate.cc:64 msgid "[BRANCH]" msgstr "[BRANCHE]" -#. Name: ancestors -#. Arguments: -#. 1 or more: revision ids -#. Added in: 0.2 -#. Purpose: Prints the ancestors (exclusive) of the given revisions -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: If any of the revisions do not exist, prints nothing to -#. stdout, prints an error message to stderr, and exits with status 1. -#. Name: descendents -#. Arguments: -#. 1 or more: revision ids -#. Added in: 0.1 -#. Purpose: Prints the descendents (exclusive) of the given revisions -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: If any of the revisions do not exist, prints nothing to -#. stdout, prints an error message to stderr, and exits with status 1. -#. Name: common_ancestors -#. Arguments: -#. 1 or more revision ids -#. Added in: 2.1 -#. Purpose: Prints all revisions which are ancestors of all of the -#. revisions given as arguments. -#. Output format: A list of revision ids, in hexadecimal, each -#. followed by a newline. Revisions are printed in alphabetically -#. sorted order. -#. Error conditions: If any of the revisions do not exist, prints -#. nothing to stdout, prints an error message to stderr, and exits -#. with status 1. -#: ../automate.cc:89 ../automate.cc:136 ../automate.cc:1202 +#: automate.cc:88 automate.cc:135 automate.cc:1206 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "RÉV1 [RÉV2 [RÉV3 [...]]]" -#: ../automate.cc:99 ../automate.cc:146 ../automate.cc:190 ../automate.cc:331 -#: ../automate.cc:366 ../automate.cc:370 ../automate.cc:429 ../automate.cc:453 -#: ../automate.cc:1212 ../cmd_list.cc:661 +#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330 +#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452 +#: automate.cc:1216 cmd_list.cc:662 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "Aucune révision « %s »" -#. Name: erase_ancestors -#. Arguments: -#. 0 or more: revision ids -#. Added in: 0.1 -#. Purpose: Prints all arguments, except those that are an ancestor of some -#. other argument. One way to think about this is that it prints the -#. minimal elements of the given set, under the ordering imposed by the -#. "child of" relation. Another way to think of it is if the arguments were -#. a branch, then we print the heads of that branch. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: If any of the revisions do not exist, prints nothing to -#. stdout, prints an error message to stderr, and exits with status 1. -#. Name: toposort -#. Arguments: -#. 0 or more: revision ids -#. Added in: 0.1 -#. Purpose: Prints all arguments, topologically sorted. I.e., if A is an -#. ancestor of B, then A will appear before B in the output list. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revisions are printed in topologically sorted order. -#. Error conditions: If any of the revisions do not exist, prints nothing to -#. stdout, prints an error message to stderr, and exits with status 1. -#: ../automate.cc:184 ../automate.cc:325 +#: automate.cc:183 automate.cc:324 msgid "[REV1 [REV2 [REV3 [...]]]]" msgstr "[RÉV1 [RÉV2 [RÉV3 [...]]]]" -#. Name: attributes -#. Arguments: -#. 1: file name -#. Added in: 1.0 -#. Purpose: Prints all attributes for a file -#. Output format: basic_io formatted output, each attribute has its own stanza: -#. -#. 'format_version' -#. used in case this format ever needs to change. -#. format: ('format_version', the string "1" currently) -#. occurs: exactly once -#. 'attr' -#. represents an attribute entry -#. format: ('attr', name, value), ('state', [unchanged|changed|added|dropped]) -#. occurs: zero or more times -#. -#. Error conditions: If the file name has no attributes, prints only the -#. format version, if the file is unknown, escalates -#: ../automate.cc:216 +#: automate.cc:215 msgid "FILE" msgstr "FICHIER" -#: ../automate.cc:236 +#: automate.cc:235 #, c-format msgid "file %s is unknown to the current workspace" msgstr "le fichier « %s » est inconnu dans l'espace de travail" -#. Name: ancestry_difference -#. Arguments: -#. 1: a revision id -#. 0 or more further arguments: also revision ids -#. Added in: 0.1 -#. Purpose: Prints all ancestors of the first revision A, that are not also -#. ancestors of the other revision ids, the "Bs". For purposes of this -#. command, "ancestor" is an inclusive term; that is, A is an ancestor of -#. one of the Bs, it will not be printed, but otherwise, it will be; and -#. none of the Bs will ever be printed. If A is a new revision, and Bs are -#. revisions that you have processed before, then this command tells you -#. which revisions are new since then. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revisions are printed in topologically sorted order. -#. Error conditions: If any of the revisions do not exist, prints nothing to -#. stdout, prints an error message to stderr, and exits with status 1. -#: ../automate.cc:357 +#: automate.cc:356 msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "NOUVELLE_RÉV [ANCIENNE_RÉV1 [ANCIENNE_RÉV2 [...]]]" -#. Name: parents -#. Arguments: -#. 1: a revision id -#. Added in: 0.2 -#. Purpose: Prints the immediate ancestors of the given revision, i.e., the -#. parents. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: If the revision does not exist, prints nothing to stdout, -#. prints an error message to stderr, and exits with status 1. -#. Name: children -#. Arguments: -#. 1: a revision id -#. Added in: 0.2 -#. Purpose: Prints the immediate descendents of the given revision, i.e., the -#. children. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: If the revision does not exist, prints nothing to stdout, -#. prints an error message to stderr, and exits with status 1. -#. Name: certs -#. Arguments: -#. 1: a revision id -#. Added in: 1.0 -#. Purpose: Prints all certificates associated with the given revision -#. ID. Each certificate is contained in a basic IO stanza. For each -#. certificate, the following values are provided: -#. -#. 'key' : a string indicating the key used to sign this certificate. -#. 'signature': a string indicating the status of the signature. -#. Possible values of this string are: -#. 'ok' : the signature is correct -#. 'bad' : the signature is invalid -#. 'unknown' : signature was made with an unknown key -#. 'name' : the name of this certificate -#. 'value' : the value of this certificate -#. 'trust' : is this certificate trusted by the defined trust metric -#. Possible values of this string are: -#. 'trusted' : this certificate is trusted -#. 'untrusted' : this certificate is not trusted -#. -#. Output format: All stanzas are formatted by basic_io. Stanzas are -#. seperated by a blank line. Values will be escaped, '\' -> '\\' and -#. '"' -> '\"'. -#. -#. Error conditions: If a certificate is signed with an unknown public -#. key, a warning message is printed to stderr. If the revision -#. specified is unknown or invalid prints an error message to stderr -#. and exits with status 1. -#: ../automate.cc:424 ../automate.cc:448 ../cmd_list.cc:651 +#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 msgid "REV" msgstr "RÉV" -#. Name: select -#. Arguments: -#. 1: selector -#. Added in: 0.2 -#. Purpose: Prints all the revisions that match the given selector. -#. Output format: A list of revision ids, in hexadecimal, each followed by a -#. newline. Revision ids are printed in alphabetically sorted order. -#. Error conditions: None. -#: ../automate.cc:525 +#: automate.cc:524 msgid "SELECTOR" msgstr "SÉLECTEUR" -#. Name: get_revision -#. Arguments: -#. 1: a revision id (optional, determined from the workspace if -#. non-existant) -#. Added in: 1.0 -#. Purpose: Prints change information for the specified revision id. -#. There are several changes that are described; each of these is -#. described by a different basic_io stanza. The first string pair -#. of each stanza indicates the type of change represented. -#. -#. All stanzas are formatted by basic_io. Stanzas are separated -#. by a blank line. Values will be escaped, '\' to '\\' and -#. '"' to '\"'. -#. -#. Possible values of this first value are along with an ordered list of -#. basic_io formatted stanzas that will be provided are: -#. -#. 'format_version' -#. used in case this format ever needs to change. -#. format: ('format_version', the string "1") -#. occurs: exactly once -#. 'new_manifest' -#. represents the new manifest associated with the revision. -#. format: ('new_manifest', manifest id) -#. occurs: exactly one -#. 'old_revision' -#. represents a parent revision. -#. format: ('old_revision', revision id) -#. occurs: either one or two times -#. 'delete -#. represents a file or directory that was deleted. -#. format: ('delete', path) -#. occurs: zero or more times -#. 'rename' -#. represents a file or directory that was renamed. -#. format: ('rename, old filename), ('to', new filename) -#. occurs: zero or more times -#. 'add_dir' -#. represents a directory that was added. -#. format: ('add_dir, path) -#. occurs: zero or more times -#. 'add_file' -#. represents a file that was added. -#. format: ('add_file', path), ('content', file id) -#. occurs: zero or more times -#. 'patch' -#. represents a file that was modified. -#. format: ('patch', filename), ('from', file id), ('to', file id) -#. occurs: zero or more times -#. 'clear' -#. represents an attr that was removed. -#. format: ('clear', filename), ('attr', attr name) -#. occurs: zero or more times -#. 'set' -#. represents an attr whose value was changed. -#. format: ('set', filename), ('attr', attr name), ('value', attr value) -#. occurs: zero or more times -#. -#. These stanzas will always occur in the order listed here; stanzas of -#. the same type will be sorted by the filename they refer to. -#. Error conditions: If the revision specified is unknown or invalid -#. prints an error message to stderr and exits with status 1. -#. Name: get_manifest_of -#. Arguments: -#. 1: a revision id (optional, determined from the workspace if not given) -#. Added in: 2.0 -#. Purpose: Prints the contents of the manifest associated with the -#. given revision ID. -#. -#. Output format: -#. There is one basic_io stanza for each file or directory in the -#. manifest. -#. -#. All stanzas are formatted by basic_io. Stanzas are separated -#. by a blank line. Values will be escaped, '\' to '\\' and -#. '"' to '\"'. -#. -#. Possible values of this first value are along with an ordered list of -#. basic_io formatted stanzas that will be provided are: -#. -#. 'format_version' -#. used in case this format ever needs to change. -#. format: ('format_version', the string "1") -#. occurs: exactly once -#. 'dir': -#. represents a directory. The path "" (the empty string) is used -#. to represent the root of the tree. -#. format: ('dir', pathname) -#. occurs: one or more times -#. 'file': -#. represents a file. -#. format: ('file', pathname), ('content', file id) -#. occurs: zero or more times -#. -#. In addition, 'dir' and 'file' stanzas may have attr information -#. included. These are appended to the stanza below the basic -#. dir/file information, with one line describing each attr. These -#. lines take the form ('attr', attr name, attr value). -#. -#. Stanzas are sorted by the path string. -#. -#. Error conditions: If the revision ID specified is unknown or -#. invalid prints an error message to stderr and exits with status 1. -#: ../automate.cc:889 ../automate.cc:1019 +#: automate.cc:893 automate.cc:1023 msgid "[REVID]" msgstr "[ID_RÉV]" -#: ../automate.cc:918 ../automate.cc:1041 ../automate.cc:1525 -#: ../automate.cc:1584 ../automate.cc:1589 +#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 +#: automate.cc:1593 #, c-format msgid "no revision %s found in database" msgstr "la révision « %s » n'existe pas dans la base de données" -#. Name: get_file -#. Arguments: -#. 1: a file id -#. Added in: 1.0 -#. Purpose: Prints the contents of the specified file. -#. -#. Output format: The file contents are output without modification. -#. -#. Error conditions: If the file id specified is unknown or invalid prints -#. an error message to stderr and exits with status 1. -#. Name: packet_for_fdata -#. Arguments: -#. 1: a file id -#. Added in: 2.0 -#. Purpose: Prints the file data in packet format -#. -#. Output format: file data in "monotone read" compatible packet format -#. -#. Error conditions: If the file id specified is unknown or invalid -#. prints an error message to stderr and exits with status 1. -#: ../automate.cc:1062 ../automate.cc:1141 +#: automate.cc:1066 automate.cc:1145 msgid "FILEID" msgstr "ID_FICHIER" -#: ../automate.cc:1069 +#: automate.cc:1073 #, c-format msgid "no file version %s found in database" msgstr "aucune version du fichier « %s » trouvé dans la base de données" -#. Name: packet_for_rdata -#. Arguments: -#. 1: a revision id -#. Added in: 2.0 -#. Purpose: Prints the revision data in packet format -#. -#. Output format: revision data in "monotone read" compatible packet -#. format -#. -#. Error conditions: If the revision id specified is unknown or -#. invalid prints an error message to stderr and exits with status 1. -#. Name: packets_for_certs -#. Arguments: -#. 1: a revision id -#. Added in: 2.0 -#. Purpose: Prints the certs associated with a revision in packet format -#. -#. Output format: certs in "monotone read" compatible packet format -#. -#. Error conditions: If the revision id specified is unknown or -#. invalid prints an error message to stderr and exits with status 1. -#: ../automate.cc:1088 ../automate.cc:1114 ../cmd_merging.cc:845 +#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845 msgid "REVID" msgstr "ID_RÉVISION" -#: ../automate.cc:1099 ../automate.cc:1125 ../automate.cc:1180 -#: ../automate.cc:1182 ../cmd_db.cc:35 ../cmd_diff_log.cc:385 -#: ../cmd_diff_log.cc:416 ../cmd_diff_log.cc:418 ../cmd_files.cc:138 -#: ../cmd_files.cc:200 ../cmd_merging.cc:125 ../cmd_merging.cc:677 -#: ../cmd_merging.cc:692 ../cmd_merging.cc:695 ../cmd_ws_commit.cc:461 -#: ../commands.cc:388 +#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 +#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "aucune révision « %s »" -#: ../automate.cc:1152 +#: automate.cc:1156 #, c-format msgid "no such file '%s'" msgstr "aucun fichier « %s »" -#. Name: packet_for_fdelta -#. Arguments: -#. 1: a file id -#. 2: a file id -#. Added in: 2.0 -#. Purpose: Prints the file delta in packet format -#. -#. Output format: file delta in "monotone read" compatible packet format -#. -#. Error conditions: If any of the file ids specified are unknown or -#. invalid prints an error message to stderr and exits with status 1. -#: ../automate.cc:1168 +#: automate.cc:1172 msgid "OLD_FILE NEW_FILE" msgstr "ANCIEN_FICHIER NOUVEL_FICHIER" -#. Name: tags -#. Arguments: -#. A branch pattern (optional). -#. Added in: 2.2 -#. Purpose: -#. If a branch pattern is given, prints all tags that are attached to -#. revisions on branches matched by the pattern; otherwise prints all tags -#. of the revision graph. -#. -#. If a branch name is ignored by means of the lua hook 'ignore_branch', -#. it is neither printed, nor can it be matched by a pattern. -#. Output format: -#. There is one basic_io stanza for each tag. -#. -#. All stanzas are formatted by basic_io. Stanzas are separated -#. by a blank line. Values will be escaped, '\' to '\\' and -#. '"' to '\"'. -#. -#. Each stanza has exactly the following four entries: -#. -#. 'tag' -#. the value of the tag cert, i.e. the name of the tag -#. 'revision' -#. the hexadecimal id of the revision the tag is attached to -#. 'signer' -#. the name of the key used to sign the tag cert -#. 'branches' -#. a (possibly empty) list of all branches the tagged revision is on -#. -#. Stanzas are printed in arbitrary order. -#. Error conditions: -#. A run-time exception is thrown for illegal patterns. -#: ../automate.cc:1313 +#: automate.cc:1317 msgid "[BRANCH_PATTERN]" msgstr "[MOTIF_DE_BRANCHE]" -#. Name: genkey -#. Arguments: -#. 1: the key ID -#. 2: the key passphrase -#. Added in: 3.1 -#. Purpose: Generates a key with the given ID and passphrase -#. -#. Output format: a basic_io stanza for the new key, as for ls keys -#. -#. Sample output: -#. name "address@hidden" -#. public_hash [475055ec71ad48f5dfaf875b0fea597b5cbbee64] -#. private_hash [7f76dae3f91bb48f80f1871856d9d519770b7f8a] -#. public_location "database" "keystore" -#. private_location "keystore" -#. -#. Error conditions: If the passphrase is empty or the key already exists, -#. prints an error message to stderr and exits with status 1. -#: ../automate.cc:1409 +#: automate.cc:1413 msgid "KEYID PASSPHRASE" msgstr "ID_CLEF PHRASE_DE_PASSE" -#: ../automate.cc:1427 ../cmd_key_cert.cc:41 +#: automate.cc:1431 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "la clef « %s » existe déjà" -#: ../automate.cc:1430 ../cmd_key_cert.cc:44 +#: automate.cc:1434 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "génération de la paire de clef « %s »" -#: ../automate.cc:1432 ../cmd_key_cert.cc:46 +#: automate.cc:1436 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "enregistrement de la paire de clefs « %s » dans %s/" -#. Name: get_option -#. Arguments: -#. 1: an options name -#. Added in: 3.1 -#. Purpose: Show the value of the named option in _MTN/options -#. -#. Output format: A string -#. -#. Sample output (for 'mtn automate get_option branch: -#. net.venge.monotone -#. -#: ../automate.cc:1468 +#: automate.cc:1472 msgid "OPTION" msgstr "OPTION" -#: ../automate.cc:1491 +#: automate.cc:1495 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "« %s » n'est pas une option reconnue pour l'espace de travail" -#. Name: get_content_changed -#. Arguments: -#. 1: a revision ID -#. 2: a file name -#. Added in: 3.2 -#. Purpose: Returns a list of revision IDs in which the content -#. was most recently changed, relative to the revision ID specified -#. in argument 1. This equates to a content mark following -#. the *-merge algorithm. -#. -#. Output format: Zero or more basic_io stanzas, each specifying a -#. revision ID for which a content mark is set. -#. -#. Each stanza has exactly one entry: -#. -#. 'content_mark' -#. the hexadecimal id of the revision the content mark is attached to -#. Sample output (for 'mtn automate get_content_changed 3bccff99d08421df72519b61a4dded16d1139c33 ChangeLog): -#. content_mark [276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f] -#. -#: ../automate.cc:1514 +#: automate.cc:1518 msgid "REV FILE" msgstr "RÉV FICHIER" -#: ../automate.cc:1531 ../automate.cc:1595 +#: automate.cc:1535 automate.cc:1599 #, c-format msgid "file %s is unknown for revision %s" msgstr "le fichier « %s » est inconnu pour la révision %s" -#. Name: get_corresponding_path -#. Arguments: -#. 1: a source revision ID -#. 2: a file name (in the source revision) -#. 3: a target revision ID -#. Added in: 3.2 -#. Purpose: Given a the file name in the source revision, a filename -#. will if possible be returned naming the file in the target revision. -#. This allows the same file to be matched between revisions, accounting -#. for renames and other changes. -#. -#. Output format: Zero or one basic_io stanzas. Zero stanzas will be -#. output if the file does not exist within the target revision; this is -#. not considered an error. -#. If the file does exist in the target revision, a single stanza with the -#. following details is output. -#. -#. The stanza has exactly one entry: -#. -#. 'file' -#. the file name corresponding to "file name" (arg 2) in the target revision -#. -#. Sample output (for automate get_corresponding_path 91f25c8ee830b11b52dd356c925161848d4274d0 foo2 dae0d8e3f944c82a9688bcd6af99f5b837b41968; see automate_get_corresponding_path test) -#. file "foo" -#: ../automate.cc:1574 +#: automate.cc:1578 msgid "REV1 FILE REV2" msgstr "RÉV1 FICHIER RÉV2" -#: ../basic_io.cc:33 +#: basic_io.cc:33 #, fuzzy, c-format msgid "parsing a %s at %d:%d:E: %s" msgstr "erreur dans %s:%d:%d:E : %s" -#: ../cert.cc:83 +#: cert.cc:83 #, fuzzy, c-format msgid "ignoring bad signature by '%s' on '%s'" msgstr "ignore mauvaise signature fait par « %s » sur « %s »\n" -#: ../cert.cc:91 +#: cert.cc:91 #, fuzzy, c-format msgid "ignoring unknown signature by '%s' on '%s'" msgstr "ignore signature inconnue fait par « %s » sur « %s »\n" -#: ../cert.cc:157 +#: cert.cc:157 #, fuzzy, c-format msgid "trust function disliked %d signers of %s cert on manifest %s" msgstr "" "function de confiance n'aimait pas %d signataires du certif %s dans le " "manifeste %s\n" -#: ../cert.cc:214 +#: cert.cc:214 #, fuzzy, c-format msgid "trust function disliked %d signers of %s cert on revision %s" msgstr "" "function de confiance n'aimait pas %d signataires du certif %s dans la " "révision %s\n" -#: ../cert.cc:303 +#: cert.cc:303 #, 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 »" -#: ../cert.cc:387 ../keys.cc:560 +#: cert.cc:387 keys.cc:560 #, 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:465 +#: cert.cc:465 #, c-format msgid "" "you have no private key to make signatures with\n" @@ -894,7 +452,7 @@ msgstr "" "vous n'avez pas de clef privé pour établir des signatures,\n" "vous avez sans doute besoin de faire « genkey  »" -#: ../cert.cc:468 +#: cert.cc:468 #, c-format msgid "" "you have multiple private keys\n" @@ -904,21 +462,21 @@ msgstr "" "choisissez-en une à utiliser pour vos signatures en ajoutant « -" "k » à votre commande" -#: ../cert.cc:485 +#: cert.cc:485 #, 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" -#: ../cert.cc:494 +#: cert.cc:494 #, 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" -#: ../cert.cc:498 +#: cert.cc:498 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" @@ -926,34 +484,40 @@ msgstr "" "multiples certifs de branche trouvés pour la révision %s, veuillez donne le " "nom d'une branche" -#: ../cmd_automate.cc:206 +#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 +#: cmd_automate.cc:340 #, c-format +msgid "Bad input to automate stdio" +msgstr "mauvaise donnée en entrée à parse_basic_io" + +#: cmd_automate.cc:168 +#, c-format msgid "read from client failed with error code: %d" msgstr "la lecture depuis le client a échoué avec le code d'erreur : %d" -#: ../cmd_automate.cc:249 -#, c-format -msgid "Bad input to automate stdio" +#: cmd_automate.cc:169 +#, fuzzy, c-format +msgid "Bad input to automate stdio (unexpected EOF)" msgstr "mauvaise donnée en entrée à parse_basic_io" -#: ../cmd_automate.cc:303 +#: cmd_automate.cc:365 msgid "automation" msgstr "automatisation" -#: ../cmd_automate.cc:304 +#: cmd_automate.cc:366 msgid "automation interface" msgstr "interface d'automatisation" -#: ../cmd_db.cc:41 +#: cmd_db.cc:41 #, 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." -#: ../cmd_db.cc:46 +#: cmd_db.cc:46 msgid "database" msgstr "base de données" -#: ../cmd_db.cc:47 +#: cmd_db.cc:47 #, fuzzy msgid "" "init\n" @@ -969,7 +533,7 @@ msgid "" "check\n" "changesetify\n" "rosterify\n" -"regenerate_rosters\n" +"regenerate_caches\n" "set_epoch BRANCH EPOCH\n" msgstr "" "init\n" @@ -987,69 +551,73 @@ msgstr "" "rosterify\n" "set_epoch BRANCHE ÉPOQUE\n" -#: ../cmd_db.cc:62 +#: cmd_db.cc:62 msgid "manipulate database state" msgstr "manipule l'état de la base de données" -#: ../cmd_db.cc:111 +#: cmd_db.cc:111 #, c-format msgid "The epoch must be %s characters" msgstr "L'époque doit faire %s caractères" -#: ../cmd_db.cc:122 ../cmd_db.cc:138 +#: cmd_db.cc:122 cmd_db.cc:138 msgid "vars" msgstr "variables" -#: ../cmd_db.cc:122 +#: cmd_db.cc:122 msgid "DOMAIN NAME VALUE" msgstr "DOMAINE NOM VALEUR" -#: ../cmd_db.cc:123 +#: cmd_db.cc:123 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" -#: ../cmd_db.cc:138 +#: cmd_db.cc:138 msgid "DOMAIN NAME" msgstr "DOMAINE NOM VALEUR" -#: ../cmd_db.cc:139 +#: cmd_db.cc:139 msgid "remove the database variable NAME in domain DOMAIN" msgstr "" "supprimer la variable NOM de la base de données dans le domaine DOMAINE" -#: ../cmd_db.cc:151 +#: cmd_db.cc:151 #, c-format msgid "no var with name %s in domain %s" msgstr "aucune variable nommée %s dans le domaine %s" -#. ////////////////////////////////////////////////////////////////////// -#: ../cmd_db.cc:155 ../cmd_diff_log.cc:331 ../cmd_diff_log.cc:541 -#: ../cmd_files.cc:114 ../cmd_files.cc:181 ../cmd_list.cc:457 -#: ../cmd_merging.cc:614 ../cmd_ws_commit.cc:355 ../commands.cc:252 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 +#: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 +#: commands.cc:275 msgid "informative" msgstr "information" -#: ../cmd_db.cc:155 +#: cmd_db.cc:155 msgid "(revision|file|key) PARTIAL-ID" msgstr "(révision|fichier|clef) ID-PARTIELLE" -#: ../cmd_db.cc:156 +#: cmd_db.cc:156 msgid "complete partial id" msgstr "remplis une identité partielle" -#: ../cmd_db.cc:165 +#: cmd_db.cc:165 #, c-format msgid "non-hex digits in partial id" msgstr "chiffres non-héxadécimaux dans l'id partielle" -#: ../cmd_diff_log.cc:331 ../cmd_ws_commit.cc:66 ../cmd_ws_commit.cc:242 -#: ../cmd_ws_commit.cc:276 ../cmd_ws_commit.cc:355 ../cmd_ws_commit.cc:661 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[CHEMIN]..." -#: ../cmd_diff_log.cc:332 +#: cmd_diff_log.cc:466 #, fuzzy msgid "" "show current diffs on stdout.\n" @@ -1063,7 +631,7 @@ msgstr "" "différence entre eux est affichée. Si aucun format n'est précisé,\n" "le format « unified » est employé par défaut." -#: ../cmd_diff_log.cc:345 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -1072,15 +640,20 @@ msgstr "" "--diff-args requiet --external\n" "essayez d'ajouter --external ou de retirer --diff-args ?" -#: ../cmd_diff_log.cc:477 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "aucun changement" -#: ../cmd_diff_log.cc:541 +#: cmd_diff_log.cc:520 +#, fuzzy +msgid "[FILE [...]]" +msgstr "[FICHIER] ..." + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[FICHIER] ..." -#: ../cmd_diff_log.cc:542 +#: cmd_diff_log.cc:604 #, fuzzy msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" @@ -1089,171 +662,169 @@ msgstr "" "Affiche l'histoire en sens inverse (filtré avec « FILE »). Si une\n" "révision ou plus sont données, emploie-les comme débuts." -#: ../cmd_diff_log.cc:604 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "seul un de --last et --next est permis" -#. fload, fmerge, and fdiff are simple commands for debugging the line -#. merger. -#: ../cmd_files.cc:28 ../cmd_files.cc:41 ../cmd_files.cc:78 -#: ../cmd_files.cc:157 ../cmd_merging.cc:845 ../cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157 +#: cmd_merging.cc:845 cmd_othervcs.cc:15 msgid "debug" msgstr "débogue" -#: ../cmd_files.cc:28 +#: cmd_files.cc:28 msgid "load file contents into db" msgstr "charger le contenu du fichier dans la base de données" -#: ../cmd_files.cc:41 +#: cmd_files.cc:41 msgid " " msgstr " " -#: ../cmd_files.cc:42 +#: cmd_files.cc:42 msgid "merge 3 files and output result" msgstr "fusionne 3 fichiers et affiche le résultat" -#: ../cmd_files.cc:56 +#: cmd_files.cc:56 #, c-format msgid "ancestor file id does not exist" msgstr "l'id du fichier de l'ancêtre n'existe pas" -#: ../cmd_files.cc:59 +#: cmd_files.cc:59 #, c-format msgid "left file id does not exist" msgstr "l'id du fichier gauche n'existe pas" -#: ../cmd_files.cc:62 +#: cmd_files.cc:62 #, c-format msgid "right file id does not exist" msgstr "l'id du fichier droit n'existe pas" -#: ../cmd_files.cc:73 +#: cmd_files.cc:73 #, c-format msgid "merge failed" msgstr "la fusion a échouée" -#: ../cmd_files.cc:78 +#: cmd_files.cc:78 msgid "SRCNAME DESTNAME SRCID DESTID" msgstr "NOMSRC NOMDEST IDSRC IDDEST" -#: ../cmd_files.cc:79 +#: cmd_files.cc:79 #, fuzzy msgid "diff 2 files and output result" msgstr "fusionne 3 fichiers et affiche le résultat" -#: ../cmd_files.cc:96 +#: cmd_files.cc:96 #, c-format msgid "source file id does not exist" msgstr "l'id du fichier source n'existe pas" -#: ../cmd_files.cc:99 +#: cmd_files.cc:99 #, c-format msgid "destination file id does not exist" msgstr "l'id du fichier de destination n'existe pas" -#: ../cmd_files.cc:114 +#: cmd_files.cc:114 msgid "PATH" msgstr "CHEMIN" -#: ../cmd_files.cc:115 +#: cmd_files.cc:115 msgid "print annotated copy of the file from REVISION" msgstr "affiche une copie annotée du fichier venant de RÉVISION" -#: ../cmd_files.cc:136 +#: cmd_files.cc:136 #, c-format msgid "no revision for file '%s' in database" msgstr "aucune révision pour le fichier « %s » dans la base de données" -#: ../cmd_files.cc:147 +#: cmd_files.cc:147 #, c-format msgid "no such file '%s' in revision '%s'" msgstr "aucun fichier « %s » dans la révision « %s »" -#: ../cmd_files.cc:150 +#: cmd_files.cc:150 #, c-format msgid "'%s' in revision '%s' is not a file" msgstr "« %s » dans la révision « %s » n'est pas un fichier" -#: ../cmd_files.cc:157 +#: cmd_files.cc:157 msgid "[PATH]" msgstr "[CHEMIN]" -#: ../cmd_files.cc:158 +#: cmd_files.cc:158 msgid "calculate identity of PATH or stdin" msgstr "calculer l'identité du CHEMIN ou de l'entrée standard" -#: ../cmd_files.cc:182 +#: cmd_files.cc:182 msgid "FILENAME" msgstr "FICHIER" -#: ../cmd_files.cc:183 +#: cmd_files.cc:183 msgid "write file from database to stdout" msgstr "écrire un fichier de la base de donnée sur la sortie standard" -#: ../cmd_files.cc:212 ../cmd_files.cc:214 +#: cmd_files.cc:212 cmd_files.cc:214 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "aucun fichier « %s » dans la révision « %s »" -#: ../cmd.hh:102 +#: cmd.hh:89 #, c-format msgid "non-hex digits in id" msgstr "chiffre non-héxadécimal dans l'id" -#: ../cmd.hh:111 +#: cmd.hh:98 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "l'identité partielle « %s » n'a pas d'expansions" -#: ../cmd.hh:115 -#, c-format -msgid "partial id '%s' has multiple ambiguous expansions:\n" +#: cmd.hh:102 +#, fuzzy, c-format +msgid "partial id '%s' has multiple ambiguous expansions:" msgstr "l'identité partielle « %s » a plusieurs expansions ambiguës : \n" -#: ../cmd.hh:123 +#: cmd.hh:110 #, c-format msgid "expanded partial id '%s' to '%s'" msgstr "développement de l'identité partielle « %s » de « %s »" -#: ../cmd.hh:206 +#: cmd.hh:195 #, c-format msgid "Alias for %s" msgstr "Synonyme pour %s" -#: ../cmd_key_cert.cc:26 ../cmd_key_cert.cc:51 ../cmd_key_cert.cc:90 -#: ../cmd_key_cert.cc:111 ../cmd_key_cert.cc:147 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 +#: cmd_key_cert.cc:113 cmd_key_cert.cc:149 msgid "key and cert" msgstr "clef et certif" -#: ../cmd_key_cert.cc:26 ../cmd_key_cert.cc:51 ../cmd_key_cert.cc:90 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 msgid "KEYID" msgstr "IDCLEF" -#: ../cmd_key_cert.cc:26 +#: cmd_key_cert.cc:26 msgid "generate an RSA key-pair" msgstr "générer une paire de clefs RSA" -#: ../cmd_key_cert.cc:51 +#: cmd_key_cert.cc:53 msgid "drop a public and private key" msgstr "supprimer une clef publique et privée" -#: ../cmd_key_cert.cc:65 +#: cmd_key_cert.cc:67 #, c-format msgid "dropping public key '%s' from database" msgstr "suppression de la clef publique « %s » de la base de données" -#: ../cmd_key_cert.cc:75 +#: cmd_key_cert.cc:77 #, c-format msgid "dropping key pair '%s' from keystore" msgstr "suppression de la paire de clefs « %s » de l'entrepôt de clefs" -#: ../cmd_key_cert.cc:82 +#: cmd_key_cert.cc:84 #, 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" -#: ../cmd_key_cert.cc:85 +#: cmd_key_cert.cc:87 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -1262,33 +833,33 @@ 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" -#: ../cmd_key_cert.cc:91 +#: cmd_key_cert.cc:93 msgid "change passphrase of a private RSA key" msgstr "changer la phrase de passe pour une clef RSA privée" -#: ../cmd_key_cert.cc:101 +#: cmd_key_cert.cc:103 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "la clef « %s » n'existe pas dans l'entrepôt de clefs" -#: ../cmd_key_cert.cc:108 +#: cmd_key_cert.cc:110 #, c-format msgid "passphrase changed" msgstr "la phrase de passe a été changée" -#: ../cmd_key_cert.cc:111 +#: cmd_key_cert.cc:113 msgid "REVISION CERTNAME [CERTVAL]" msgstr "RÉVISION NOM_DE_CERTIF [VALEUR_DE_CERTIF]" -#: ../cmd_key_cert.cc:112 +#: cmd_key_cert.cc:114 msgid "create a cert for a revision" msgstr "créer un certif pour une révision" -#: ../cmd_key_cert.cc:148 +#: cmd_key_cert.cc:150 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "RÉVISION NOM VALEUR SIGNATAIRE1 [SIGNATAIRE2 [...]]" -#: ../cmd_key_cert.cc:149 +#: cmd_key_cert.cc:151 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -1296,14 +867,14 @@ msgstr "" "test s'il est possible d'avoir confiance en un certif hypothétique\n" "avec les paramètres actuels" -#: ../cmd_key_cert.cc:182 -#, c-format +#: cmd_key_cert.cc:184 +#, fuzzy, c-format msgid "" "if a cert on: %s\n" "with key: %s\n" "and value: %s\n" "was signed by: %s\n" -"it would be: %s\n" +"it would be: %s" msgstr "" "si un certif sur : %s\n" "avec la clef : %s\n" @@ -1311,72 +882,72 @@ msgstr "" "était signé par : %s\n" "il serait : %s\n" -#: ../cmd_key_cert.cc:191 +#: cmd_key_cert.cc:193 msgid "trusted" msgstr "fiable" -#: ../cmd_key_cert.cc:191 +#: cmd_key_cert.cc:193 msgid "UNtrusted" msgstr "NON-fiable" -#: ../cmd_key_cert.cc:194 ../cmd_key_cert.cc:207 ../cmd_key_cert.cc:220 -#: ../cmd_key_cert.cc:236 ../cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:189 msgid "review" msgstr "examination" -#: ../cmd_key_cert.cc:194 +#: cmd_key_cert.cc:197 msgid "REVISION TAGNAME" msgstr "RÉVISION ÉTIQUETTE" -#: ../cmd_key_cert.cc:195 +#: cmd_key_cert.cc:198 msgid "put a symbolic tag cert on a revision" msgstr "mettre une certif-étiquette symbolique sur une révision" -#: ../cmd_key_cert.cc:207 +#: cmd_key_cert.cc:210 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: ../cmd_key_cert.cc:208 +#: cmd_key_cert.cc:211 msgid "note the results of running a test on a revision" msgstr "note le résultat d'un test sur une révision" -#: ../cmd_key_cert.cc:220 ../cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:189 msgid "REVISION" msgstr "RÉVISION" -#: ../cmd_key_cert.cc:221 +#: cmd_key_cert.cc:224 msgid "approve of a particular revision" msgstr "approuver une révision particulière" -#: ../cmd_key_cert.cc:232 +#: cmd_key_cert.cc:235 #, c-format msgid "need --branch argument for approval" msgstr "il faut un argument --branch pour approuver" -#: ../cmd_key_cert.cc:236 +#: cmd_key_cert.cc:239 msgid "REVISION [COMMENT]" msgstr "RÉVISION [COMMENTAIRE]" -#: ../cmd_key_cert.cc:237 +#: cmd_key_cert.cc:240 msgid "comment on a particular revision" msgstr "commenter une révision en particulier" -#: ../cmd_key_cert.cc:249 +#: cmd_key_cert.cc:252 #, c-format msgid "edit comment failed" msgstr "l'édition du commentaire a échoué" -#: ../cmd_key_cert.cc:254 +#: cmd_key_cert.cc:257 #, c-format msgid "empty comment" msgstr "commentaire vide" -#: ../cmd_list.cc:64 ../cmd_list.cc:675 +#: cmd_list.cc:64 cmd_list.cc:676 #, c-format msgid "no public key '%s' found in database" msgstr "aucune clef publique « %s » dans la base de données" -#: ../cmd_list.cc:74 +#: cmd_list.cc:74 #, c-format msgid "" "Key : %s\n" @@ -1389,39 +960,39 @@ msgstr "" "Nom : %s\n" "Valeur : %s\n" -#: ../cmd_list.cc:108 +#: cmd_list.cc:108 msgid "ok" msgstr "0K" -#: ../cmd_list.cc:111 +#: cmd_list.cc:111 msgid "bad" msgstr "mauvais" -#: ../cmd_list.cc:114 +#: cmd_list.cc:114 msgid "unknown" msgstr "inconnu" -#: ../cmd_list.cc:202 +#: cmd_list.cc:202 #, c-format msgid "(*) - only in %s/" msgstr "(*) - uniquement dans %s/" -#: ../cmd_list.cc:226 +#: cmd_list.cc:226 #, c-format msgid "no keys found" msgstr "aucune clef trouvée" -#: ../cmd_list.cc:228 +#: cmd_list.cc:228 #, c-format msgid "no keys found matching '%s'" msgstr "aucune clef correspondant à « %s »" -#: ../cmd_list.cc:275 +#: cmd_list.cc:275 #, c-format msgid "no epoch for branch %s" msgstr "la branche %s n'a pas d'époque" -#: ../cmd_list.cc:458 +#: cmd_list.cc:459 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -1447,7 +1018,7 @@ msgstr "" "missing\n" "changed" -#: ../cmd_list.cc:469 +#: cmd_list.cc:470 #, fuzzy msgid "" "show database objects, or the current workspace manifest, \n" @@ -1458,13 +1029,13 @@ msgstr "" "travail actuel, ou des fichiers connus, inconnus, intentionnellement\n" "ignorés, manquants ou changés" -#: ../cmd_merging.cc:73 ../cmd_merging.cc:655 ../cmd_ws_commit.cc:66 -#: ../cmd_ws_commit.cc:242 ../cmd_ws_commit.cc:276 ../cmd_ws_commit.cc:311 -#: ../cmd_ws_commit.cc:336 ../cmd_ws_commit.cc:561 ../cmd_ws_commit.cc:661 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66 +#: cmd_ws_commit.cc:252 cmd_ws_commit.cc:293 cmd_ws_commit.cc:329 +#: cmd_ws_commit.cc:354 cmd_ws_commit.cc:579 cmd_ws_commit.cc:679 msgid "workspace" msgstr "espace de travail" -#: ../cmd_merging.cc:74 +#: cmd_merging.cc:74 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -1479,18 +1050,18 @@ msgstr "" "cette révision. Sinon, met à jour basé sur la révision d'entré de\n" "la branche actuelle." -#: ../cmd_merging.cc:95 +#: cmd_merging.cc:95 #, c-format msgid "this workspace is a new project; cannot update" msgstr "" "cet espace de travail est un nouveau projet, impossible de mettre à jour" -#: ../cmd_merging.cc:102 +#: cmd_merging.cc:102 #, c-format msgid "updating along branch '%s'" msgstr "mise à jour selon la branche « %s »" -#: ../cmd_merging.cc:106 +#: cmd_merging.cc:106 #, fuzzy, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1501,37 +1072,37 @@ msgstr "" "actuelle. Elle ne correspond même pas à la révision actuelle.\n" "Peut-être voulez-vous employer --revision=?" -#: ../cmd_merging.cc:112 +#: cmd_merging.cc:112 #, c-format msgid "multiple update candidates:" msgstr "plusieurs candidats pour la mise à jour :" -#: ../cmd_merging.cc:116 +#: cmd_merging.cc:116 #, c-format msgid "choose one with '%s update -r'" msgstr "choisissez en un avec « %s update -r »" -#: ../cmd_merging.cc:117 +#: cmd_merging.cc:117 #, c-format msgid "multiple update candidates remain after selection" msgstr "il reste plusieurs candidats possible après la sélection" -#: ../cmd_merging.cc:136 +#: cmd_merging.cc:136 #, c-format msgid "already up to date at %s" msgstr "déjà à jour en %s" -#: ../cmd_merging.cc:144 +#: cmd_merging.cc:144 #, c-format msgid "selected update target %s" msgstr "sélection de la cible %s pour la mise à jour" -#: ../cmd_merging.cc:171 +#: cmd_merging.cc:171 #, c-format msgid "target revision is not in current branch" msgstr "la révision cible n'est pas dans la branche actuelle" -#: ../cmd_merging.cc:179 +#: cmd_merging.cc:179 #, fuzzy, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -1541,223 +1112,218 @@ msgstr "" "la révision %s n'est pas membre de la branche %s\n" "éssayez de nouveau avec un --branch explicit\n" -#: ../cmd_merging.cc:187 +#: cmd_merging.cc:187 #, fuzzy, c-format msgid "switching to branch %s" msgstr "commence à confier sur la branche « %s »\n" -#: ../cmd_merging.cc:192 +#: cmd_merging.cc:192 #, c-format msgid "" "target revision not in any branch\n" "next commit will use branch %s" msgstr "" -#: ../cmd_merging.cc:262 +#: cmd_merging.cc:262 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "changement de branche; le prochain commit utilisera la branche %s" -#: ../cmd_merging.cc:263 +#: cmd_merging.cc:263 #, c-format msgid "updated to base revision %s" msgstr "mise à jour vers la révision de base %s" -#. Now it's time for the real work. -#: ../cmd_merging.cc:301 +#: cmd_merging.cc:301 #, c-format msgid "[left] %s" msgstr "[gauche] %s" -#: ../cmd_merging.cc:302 +#: cmd_merging.cc:302 #, c-format msgid "[right] %s" msgstr "[droite] %s" -#: ../cmd_merging.cc:313 ../cmd_merging.cc:584 +#: cmd_merging.cc:313 cmd_merging.cc:584 #, c-format msgid "[merged] %s" msgstr "[fusionné] %s" -#. should merge support --message, --message-file? It seems somewhat weird, -#. since a single 'merge' command may perform arbitrarily many actual merges. -#. (Possibility: append the --message/--message-file text to the synthetic -#. log message constructed in merge_two().) -#: ../cmd_merging.cc:320 ../cmd_merging.cc:419 ../cmd_merging.cc:430 -#: ../cmd_merging.cc:588 ../cmd_merging.cc:821 ../cmd_ws_commit.cc:421 -#: ../cmd_ws_commit.cc:901 ../cmd_ws_commit.cc:924 ../cmd_ws_commit.cc:938 +#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588 +#: cmd_merging.cc:821 cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 msgid "tree" msgstr "arborescence" -#: ../cmd_merging.cc:320 +#: cmd_merging.cc:320 msgid "merge unmerged heads of branch" msgstr "fusionne les entrées de la branche non fusionnées" -#: ../cmd_merging.cc:330 ../cmd_merging.cc:829 +#: cmd_merging.cc:330 cmd_merging.cc:829 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "veuillez préciser une branche avec --branch=BRANCHE" -#: ../cmd_merging.cc:335 ../cmd_merging.cc:469 ../cmd_merging.cc:472 -#: ../cmd_merging.cc:834 ../cmd_ws_commit.cc:445 +#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 +#: cmd_ws_commit.cc:463 #, c-format msgid "branch '%s' is empty" msgstr "la branche « %s » est vide" -#: ../cmd_merging.cc:338 +#: cmd_merging.cc:338 #, c-format msgid "branch '%s' is already merged" msgstr "la branche « %s » est déjà fusionnée" -#: ../cmd_merging.cc:342 +#: cmd_merging.cc:342 #, c-format msgid "%d head on branch '%s'" msgid_plural "%d heads on branch '%s'" msgstr[0] "il y %d entrée dans la branche « %s »" msgstr[1] "il y a %d entrées dans la branche « %s »" -#: ../cmd_merging.cc:363 ../cmd_merging.cc:408 +#: cmd_merging.cc:363 cmd_merging.cc:408 #, c-format msgid "merge %d / %d:" msgstr "fusionné %d / %d :" -#: ../cmd_merging.cc:364 +#: cmd_merging.cc:364 #, c-format msgid "calculating best pair of heads to merge next" msgstr "" -#: ../cmd_merging.cc:416 +#: cmd_merging.cc:416 #, c-format msgid "note: your workspaces have not been updated" msgstr "note: vos espaces de travail n'ont pas été mis à jour" -#: ../cmd_merging.cc:419 +#: cmd_merging.cc:419 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION" -#: ../cmd_merging.cc:420 +#: cmd_merging.cc:420 msgid "merge from one branch to another asymmetrically" msgstr "fusion d'une branche à une autre asymétriquement" -#: ../cmd_merging.cc:430 +#: cmd_merging.cc:430 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "BRANCHE-SOURCE BRANCHE-DESTINATION DOSSIER" -#: ../cmd_merging.cc:431 +#: cmd_merging.cc:431 msgid "merge one branch into a subdirectory in another branch" msgstr "fusionnez une branche dans un sous-dossier d'une autre branche" -#: ../cmd_merging.cc:470 ../cmd_merging.cc:473 +#: cmd_merging.cc:470 cmd_merging.cc:473 #, c-format msgid "branch '%s' is not merged" msgstr "la branche « %s » n'est pas fusionnée" -#: ../cmd_merging.cc:478 +#: cmd_merging.cc:478 #, c-format msgid "propagating %s -> %s" msgstr "propage %s -> %s" -#: ../cmd_merging.cc:479 +#: cmd_merging.cc:479 #, c-format msgid "[source] %s" msgstr "[source] %s" -#: ../cmd_merging.cc:480 +#: cmd_merging.cc:480 #, c-format msgid "[target] %s" msgstr "[cible] %s" -#: ../cmd_merging.cc:485 +#: cmd_merging.cc:485 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "la branche « %s » est à jour par rapport à la branche « %s »" -#: ../cmd_merging.cc:487 +#: cmd_merging.cc:487 #, c-format msgid "no action taken" msgstr "rien n'a été fait" -#: ../cmd_merging.cc:491 +#: cmd_merging.cc:491 #, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "fusion non nécessaire; met %s dans la branche « %s »" -#: ../cmd_merging.cc:529 +#: cmd_merging.cc:529 #, c-format msgid "Path %s not found in destination tree." msgstr "Chemin %s pas trouvé dans l'arborescence de destination." -#: ../cmd_merging.cc:589 +#: cmd_merging.cc:589 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "RÉVISION-GAUCHE RÉVISION-DROITE BRANCHE-DESTINATION" -#: ../cmd_merging.cc:590 +#: cmd_merging.cc:590 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" -#: ../cmd_merging.cc:605 +#: cmd_merging.cc:605 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s et %s sont la même révision, j'abandonne" -#: ../cmd_merging.cc:607 ../cmd_merging.cc:609 +#: cmd_merging.cc:607 cmd_merging.cc:609 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s est déjà un ancêtre de %s" -#: ../cmd_merging.cc:614 +#: cmd_merging.cc:614 msgid "REV REV" msgstr "RÉV RÉV" -#: ../cmd_merging.cc:615 +#: cmd_merging.cc:615 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." -#: ../cmd_merging.cc:625 ../cmd_merging.cc:627 +#: cmd_merging.cc:625 cmd_merging.cc:627 #, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "%s est un ancêtre de %s; aucune fusion n'est nécessaire." -#: ../cmd_merging.cc:641 +#: cmd_merging.cc:641 #, c-format msgid "There are %s node_name_conflicts." msgstr "Il y a %s node_name_conflicts." -#: ../cmd_merging.cc:643 +#: cmd_merging.cc:643 #, c-format msgid "There are %s file_content_conflicts." msgstr "Il y a %s file_content_conflicts." -#: ../cmd_merging.cc:645 +#: cmd_merging.cc:645 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Il y a %s node_attr_conflicts." -#: ../cmd_merging.cc:647 +#: cmd_merging.cc:647 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Il y a %s orphaned_node_conflicts." -#: ../cmd_merging.cc:649 +#: cmd_merging.cc:649 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Il y a %s rename_target_conflicts." -#: ../cmd_merging.cc:651 +#: cmd_merging.cc:651 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Il y a %s directory_loop_conflicts." -#: ../cmd_merging.cc:655 +#: cmd_merging.cc:655 msgid "[-r FROM] -r TO [PATH...]" msgstr "[-r DEPUIS] -r VERS [CHEMIN...]" -#: ../cmd_merging.cc:656 +#: cmd_merging.cc:656 msgid "" "Apply changes made at arbitrary places in history to current workspace.\n" "This command takes changes made at any point in history, and\n" @@ -1773,7 +1339,7 @@ msgstr "" "first revision to the second." msgstr "" -#: ../cmd_merging.cc:681 +#: cmd_merging.cc:681 #, c-format msgid "" "revision %s is a merge\n" @@ -1784,130 +1350,129 @@ msgstr "" "pour appliquer les changements relatifs à un de ces parents, utiliser :\n" " %s pluck -r PARENT -r %s" -#: ../cmd_merging.cc:702 +#: cmd_merging.cc:702 #, c-format msgid "no changes to apply" msgstr "aucun changement à appliquer" -#: ../cmd_merging.cc:759 +#: cmd_merging.cc:759 #, c-format msgid "no changes to be applied" msgstr "aucun changement à appliquer" -#: ../cmd_merging.cc:786 +#: cmd_merging.cc:786 #, c-format msgid "no changes were applied" msgstr "aucun changement n'ont été appliqués" -#: ../cmd_merging.cc:789 +#: cmd_merging.cc:789 #, c-format msgid "applied changes to workspace" msgstr "les changements ont été appliqués l'espace de travail" -#: ../cmd_merging.cc:821 +#: cmd_merging.cc:821 msgid "show unmerged head revisions of branch" msgstr "affiche les entrées non fusionné de la branche" -#: ../cmd_merging.cc:836 +#: cmd_merging.cc:836 #, c-format msgid "branch '%s' is currently merged:" msgstr "la branche « %s » est actuellement fusionnée :" -#: ../cmd_merging.cc:838 +#: cmd_merging.cc:838 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "la branche « %s » n'est actuellement pas fusionnée :" -#: ../cmd_merging.cc:846 +#: cmd_merging.cc:846 msgid "dump the roster associated with the given REVID" msgstr "décharge la list associée avec l'ID_RÉV donnée" -#: ../cmd_netsync.cc:40 +#: cmd_netsync.cc:43 #, c-format msgid "setting default server to %s" msgstr "paramétrage de l'adresse par défaut du serveur à %s" -#: ../cmd_netsync.cc:46 +#: cmd_netsync.cc:49 #, c-format msgid "no hostname given" msgstr "aucun nom d'hôte fourni" -#: ../cmd_netsync.cc:48 +#: cmd_netsync.cc:51 #, c-format msgid "no server given and no default server set" msgstr "aucun serveur donné et aucun serveur établi comme défaut" -#: ../cmd_netsync.cc:59 ../cmd_netsync.cc:79 +#: cmd_netsync.cc:79 cmd_netsync.cc:101 #, c-format msgid "no branch pattern given" msgstr "aucun motif de branche fourni" -#: ../cmd_netsync.cc:67 +#: cmd_netsync.cc:88 #, fuzzy, c-format msgid "setting default branch include pattern to '%s'" msgstr "établi le motif de branche à inclure par défaut à « %s »\n" -#: ../cmd_netsync.cc:73 +#: cmd_netsync.cc:95 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "paramétrage du motif de branche à exclure par défaut à « %s »" -#: ../cmd_netsync.cc:81 +#: cmd_netsync.cc:103 #, 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" -#: ../cmd_netsync.cc:97 ../cmd_netsync.cc:112 ../cmd_netsync.cc:126 -#: ../cmd_netsync.cc:173 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 msgid "network" msgstr "réseau" -#: ../cmd_netsync.cc:97 ../cmd_netsync.cc:112 ../cmd_netsync.cc:126 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORT] [MOTIF]]" -#: ../cmd_netsync.cc:98 +#: cmd_netsync.cc:120 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "" "envoie les branches correspondant au MOTIF au serveur netsync à l'ADRESSE" -#: ../cmd_netsync.cc:113 +#: cmd_netsync.cc:133 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "" "récupère les branches correspondant au MOTIF du serveur netsync à ADRESSE" -#: ../cmd_netsync.cc:120 +#: cmd_netsync.cc:141 #, fuzzy, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "" "récupération anonyme; utilisez -kNOMCLEF si vous avez besoin d'une " "authentification\n" -#: ../cmd_netsync.cc:127 +#: cmd_netsync.cc:148 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" "synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE" -#: ../cmd_netsync.cc:149 +#: cmd_netsync.cc:167 #, c-format msgid "pid file '%s' already exists" msgstr "le fichier pid « %s » existe déjà" -#: ../cmd_netsync.cc:151 +#: cmd_netsync.cc:169 #, c-format msgid "failed to create pid file '%s'" msgstr "impossible de créer le fichier pid « %s »" -#: ../cmd_netsync.cc:173 +#: cmd_netsync.cc:191 msgid "PATTERN ..." msgstr "CHEMIN ..." -#: ../cmd_netsync.cc:174 +#: cmd_netsync.cc:192 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" -#: ../cmd_netsync.cc:190 +#: cmd_netsync.cc:208 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1915,18 +1480,18 @@ msgstr "" "il faut vôtre permission pour garder la phrase de passe de façon persistante " "(voyez la procédure automatique persiste_phrase_ok())" -#: ../cmd_netsync.cc:196 +#: cmd_netsync.cc:214 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" msgstr "" "L'option --no-transport-auth n'est permise qu'en combinaison avec --stdio" -#: ../cmd_othervcs.cc:15 +#: cmd_othervcs.cc:15 msgid "RCSFILE..." msgstr "FICHIER_RCS..." -#: ../cmd_othervcs.cc:16 +#: cmd_othervcs.cc:16 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1936,69 +1501,69 @@ msgstr "" "cette commande ne reconstruit ou n'importe pas des révisions. Vous voulez\n" "probablement cvs_import" -#: ../cmd_othervcs.cc:32 +#: cmd_othervcs.cc:32 msgid "rcs" msgstr "rcs" -#: ../cmd_othervcs.cc:32 +#: cmd_othervcs.cc:32 msgid "CVSROOT" msgstr "CVSROOT" -#: ../cmd_othervcs.cc:33 +#: cmd_othervcs.cc:33 msgid "import all versions in CVS repository" msgstr "importer toutes les versions d'un dépôt CVS" -#: ../cmd_packet.cc:21 ../cmd_packet.cc:50 ../cmd_packet.cc:69 +#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69 msgid "packet i/o" msgstr "e/s de paquets" -#: ../cmd_packet.cc:21 ../cmd_packet.cc:50 +#: cmd_packet.cc:21 cmd_packet.cc:50 msgid "ID" msgstr "ID" -#: ../cmd_packet.cc:22 +#: cmd_packet.cc:22 msgid "write public key packet to stdout" msgstr "écrire un pacquet pour un clef publique sur la sortie standard" -#: ../cmd_packet.cc:44 +#: cmd_packet.cc:44 #, c-format msgid "public key '%s' does not exist" msgstr "la clef publique « %s » n'existe pas" -#: ../cmd_packet.cc:51 +#: cmd_packet.cc:51 msgid "write private key packet to stdout" msgstr "écrire un pacquet pour un clef privée sur la sortie standard" -#: ../cmd_packet.cc:59 +#: cmd_packet.cc:59 #, 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" -#: ../cmd_packet.cc:70 +#: cmd_packet.cc:70 msgid "read packets from files or stdin" msgstr "lecture des paquets depuis des fichiers ou l'entrée standard" -#: ../cmd_packet.cc:78 +#: cmd_packet.cc:78 #, c-format msgid "no packets found on stdin" msgstr "aucun paquet trouvé sur l'entrée standard" -#: ../cmd_packet.cc:90 +#: cmd_packet.cc:90 #, 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" -#: ../cmd_packet.cc:94 +#: cmd_packet.cc:94 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "lu %d paquet" msgstr[1] "lu %d paquets" -#: ../cmd_ws_commit.cc:45 +#: cmd_ws_commit.cc:45 #, fuzzy msgid "" "Enter a description of this change.\n" @@ -2007,65 +1572,75 @@ msgstr "" "Saisissez une description pour cette modification.\n" "Les lignes débutant par « MTN: » sont supprimées automatiquement.\n" -#: ../cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:62 #, c-format msgid "edit of log message failed" msgstr "l'édition du message du journal a échoué" -#: ../cmd_ws_commit.cc:67 +#: cmd_ws_commit.cc:67 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "" "retourne les fichiers, dossiers ou l'espace de travail en entier (\".\") à " "la révision de base" -#: ../cmd_ws_commit.cc:75 +#: cmd_ws_commit.cc:75 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "vous devez fournir au moins un chemin à « revert » (peut-être « . » ?)" -#: ../cmd_ws_commit.cc:95 +#: cmd_ws_commit.cc:95 #, c-format msgid "no missing files to revert" msgstr "aucun fichier manquant à rétablir" -#: ../cmd_ws_commit.cc:150 +#: cmd_ws_commit.cc:150 #, c-format msgid "reverting %s" msgstr "retourne %s à la révision de base" -#: ../cmd_ws_commit.cc:154 +#: cmd_ws_commit.cc:154 #, 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" -#: ../cmd_ws_commit.cc:167 +#: cmd_ws_commit.cc:167 #, c-format msgid "recreating %s/" msgstr "re-crée %s/" -#: ../cmd_ws_commit.cc:190 +#: cmd_ws_commit.cc:190 msgid "disapprove of a particular revision" msgstr "désapprouver une révision en particulier" -#: ../cmd_ws_commit.cc:203 -#, c-format -msgid "revision '%s' has %d changesets, cannot invert\n" +#: cmd_ws_commit.cc:206 +#, fuzzy, c-format +msgid "revision %s has %d changesets, cannot invert" msgstr "la révision %s a %d ensembles de changement, je ne peux pas invertir\n" -#: ../cmd_ws_commit.cc:207 +#: cmd_ws_commit.cc:210 #, c-format msgid "need --branch argument for disapproval" msgstr "il faut un argument --branch pour désapprouver" -#: ../cmd_ws_commit.cc:243 +#: cmd_ws_commit.cc:253 msgid "add files to workspace" msgstr "ajouter des fichiers à l'espace de travail" -#: ../cmd_ws_commit.cc:277 +#: cmd_ws_commit.cc:260 +#, c-format +msgid "cannot set '--unknown' and '--recursive' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:262 +#, c-format +msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:294 msgid "drop files from workspace" msgstr "supprimer des fichiers de l'espace de travail" -#: ../cmd_ws_commit.cc:312 +#: cmd_ws_commit.cc:330 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -2073,15 +1648,15 @@ msgstr "" "SOURCE DESTINATION\n" "SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION" -#: ../cmd_ws_commit.cc:314 +#: cmd_ws_commit.cc:332 msgid "rename entries in the workspace" msgstr "renommer des entrées dans l'espace de travail" -#: ../cmd_ws_commit.cc:336 +#: cmd_ws_commit.cc:354 msgid "NEW_ROOT PUT_OLD" msgstr "RACINE_NOUVELLE PLACE_ANCIENNE" -#: ../cmd_ws_commit.cc:337 +#: cmd_ws_commit.cc:355 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -2095,38 +1670,31 @@ msgstr "" "deviendra le dossier appelé PLACE_ANCIENNE.\n" "Il est fortement recommandé d'employer --execute." -#: ../cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:373 msgid "show status of workspace" msgstr "afficher l'état de l'espace de travail" -#. We intentionally do not collapse the final \n into the format -#. strings here, for consistency with newline conventions used by most -#. other format strings. -#: ../cmd_ws_commit.cc:384 +#: cmd_ws_commit.cc:402 #, c-format msgid "Current branch: %s" msgstr "Branche actuelle : %s" -#. A colon at the end of this string looked nicer, but it made -#. double-click copying from terminals annoying. -#: ../cmd_ws_commit.cc:390 +#: cmd_ws_commit.cc:408 #, c-format msgid "Changes against parent %s" msgstr "Changement par rapport au parent %s" -#: ../cmd_ws_commit.cc:395 +#: cmd_ws_commit.cc:413 #, c-format msgid " no changes" -msgstr "" -" aucun changement" +msgstr " aucun changement" -#: ../cmd_ws_commit.cc:399 +#: cmd_ws_commit.cc:417 #, c-format msgid " dropped %s" -msgstr "" -" supprime %s" +msgstr " supprime %s" -#: ../cmd_ws_commit.cc:404 +#: cmd_ws_commit.cc:422 #, c-format msgid "" " renamed %s\n" @@ -2135,23 +1703,21 @@ msgstr "" " renomme %s\n" " en %s" -#: ../cmd_ws_commit.cc:409 ../cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 #, c-format msgid " added %s" -msgstr "" -" ajoute %s" +msgstr " ajoute %s" -#: ../cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:435 #, c-format msgid " patched %s" -msgstr "" -" modifie %s" +msgstr " modifie %s" -#: ../cmd_ws_commit.cc:421 -msgid "[DIRECTORY]\n" -msgstr "[DOSSIER]\n" +#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +msgid "[DIRECTORY]" +msgstr "[DOSSIER]" -#: ../cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:440 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" @@ -2165,47 +1731,47 @@ msgstr "" "Si aucun nom de dossier n'est fourni, le nom de la branche sera utilisé\n" "comme nom de dossier" -#: ../cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:458 #, c-format msgid "use --revision or --branch to specify what to checkout" msgstr "utiliser --revision ou --branch pour préciser quoi récupérer" -#: ../cmd_ws_commit.cc:448 +#: cmd_ws_commit.cc:466 #, c-format msgid "branch %s has multiple heads:" msgstr "la branche %s a plusieurs entrées :" -#: ../cmd_ws_commit.cc:451 +#: cmd_ws_commit.cc:469 #, fuzzy, c-format msgid "choose one with '%s checkout -r'" msgstr "choisissez en un avec « %s update -r »\n" -#: ../cmd_ws_commit.cc:452 +#: cmd_ws_commit.cc:470 #, c-format msgid "branch %s has multiple heads" msgstr "la branche %s a plusieurs entrées" -#: ../cmd_ws_commit.cc:479 +#: cmd_ws_commit.cc:497 #, c-format msgid "revision %s is not a member of branch %s" msgstr "la révision %s n'est pas membre de la branche %s" -#: ../cmd_ws_commit.cc:496 +#: cmd_ws_commit.cc:514 #, c-format msgid "you must specify a destination directory" msgstr "vous devez préciser un dossier de destination" -#: ../cmd_ws_commit.cc:509 +#: cmd_ws_commit.cc:527 #, fuzzy, c-format msgid "checkout directory '%s' already exists" msgstr "le fichier « %s » existe déjà" -#: ../cmd_ws_commit.cc:543 +#: cmd_ws_commit.cc:561 #, c-format msgid "no file %s found in database for %s" msgstr "aucun fichier « %s » trouvé dans la base de données pour %s" -#: ../cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:579 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -2215,45 +1781,45 @@ msgstr "" "get CHEMIN [ATTR]\n" "drop CHEMIN [ATTR]" -#: ../cmd_ws_commit.cc:562 +#: cmd_ws_commit.cc:580 msgid "set, get or drop file attributes" msgstr "établis, obtiens ou supprime des attributs de fichiers" -#: ../cmd_ws_commit.cc:579 +#: cmd_ws_commit.cc:597 #, c-format msgid "Unknown path '%s'" msgstr "Chemin inconnu « %s »" -#: ../cmd_ws_commit.cc:608 -#, c-format -msgid "Path '%s' does not have attribute '%s'\n" +#: cmd_ws_commit.cc:626 +#, fuzzy, c-format +msgid "Path '%s' does not have attribute '%s'" msgstr "Le chemin « %s » n'a pas d'attribut « %s »\n" -#: ../cmd_ws_commit.cc:638 +#: cmd_ws_commit.cc:656 #, c-format msgid "No attributes for '%s'" msgstr "Pas d'attributs pour « %s »" -#: ../cmd_ws_commit.cc:649 +#: cmd_ws_commit.cc:667 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Pas d'attribut « %s » pour le chemin « %s »" -#: ../cmd_ws_commit.cc:662 +#: cmd_ws_commit.cc:680 msgid "commit workspace to database" msgstr "confie un espace de travail à la base de données" -#: ../cmd_ws_commit.cc:693 +#: cmd_ws_commit.cc:711 #, c-format msgid "no changes to commit" msgstr "aucun changement à confier" -#: ../cmd_ws_commit.cc:707 +#: cmd_ws_commit.cc:731 #, fuzzy, c-format msgid "beginning commit on branch '%s'" msgstr "commence à confier sur la branche « %s »\n" -#: ../cmd_ws_commit.cc:716 +#: cmd_ws_commit.cc:740 #, fuzzy, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -2265,37 +1831,37 @@ msgstr "" "veuillez déplacé ou supprimer MT/log,\n" "ou supprimer --message/--message-file de la linge de commande" -#: ../cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:755 #, fuzzy, c-format msgid "empty log message; commit canceled" msgstr "message du journal vide; confidence arrêtée" -#: ../cmd_ws_commit.cc:753 +#: cmd_ws_commit.cc:777 #, c-format msgid "log message rejected by hook: %s" msgstr "entrée du journal rejetée par le hook : %s" -#: ../cmd_ws_commit.cc:761 +#: cmd_ws_commit.cc:785 #, c-format msgid "revision %s already in database" msgstr "la révision %s est déjà dans la base de données" -#: ../cmd_ws_commit.cc:800 ../cmd_ws_commit.cc:830 +#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "le fichier « %s » a été modifié pendant le commit, interruption" -#: ../cmd_ws_commit.cc:812 +#: cmd_ws_commit.cc:836 #, fuzzy, c-format msgid "Your database is missing version %s of file '%s'" msgstr "le sondage de la version de la base de données dans « %s » a échouée" -#: ../cmd_ws_commit.cc:862 +#: cmd_ws_commit.cc:886 #, c-format msgid "committed revision %s" msgstr "révision %s commitée" -#: ../cmd_ws_commit.cc:868 +#: cmd_ws_commit.cc:892 #, c-format msgid "" "note: this revision creates divergence\n" @@ -2304,79 +1870,74 @@ msgstr "" "note: cette révision a créé une divergence\n" "note: peut-être (ou peut-être pas) voulez-vous exécuter « %s merge » ?" -#: ../cmd_ws_commit.cc:901 ../cmd_ws_commit.cc:924 -msgid "[DIRECTORY]" -msgstr "[DOSSIER]" - -#: ../cmd_ws_commit.cc:902 +#: cmd_ws_commit.cc:926 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" -#: ../cmd_ws_commit.cc:908 +#: cmd_ws_commit.cc:932 #, c-format msgid "need --branch argument for setup" msgstr "setup a besoin d'un argument pour --branch" -#: ../cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:949 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" msgstr "" -#: ../cmd_ws_commit.cc:938 +#: cmd_ws_commit.cc:962 msgid "refresh the inodeprint cache" msgstr "rafraîchir le cache d'inodeprint" -#: ../commands.cc:131 ../commands.cc:233 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "commande inconnue « %s »" -#. more than one matched command -#: ../commands.cc:142 -#, c-format -msgid "command '%s' has multiple ambiguous expansions:\n" +#: commands.cc:150 +#, fuzzy, c-format +msgid "command '%s' has multiple ambiguous expansions:" msgstr "la commande « %s » a plusieurs expansions ambiguës : \n" -#: ../commands.cc:175 +#: commands.cc:183 msgid "commands:" msgstr "commandes :" -#: ../commands.cc:252 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "commande [ARGUMENTS...]" -#: ../commands.cc:252 +#: commands.cc:276 msgid "display command help" msgstr "afficher l'aide de la commande" -#: ../commands.cc:395 +#: commands.cc:420 #, c-format msgid "expanding selection '%s'" msgstr "expansion de la sélection « %s »" -#: ../commands.cc:403 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "aucune correspondance pour la sélection « %s »" -#: ../commands.cc:409 +#: commands.cc:434 #, fuzzy, c-format msgid "expanded to '%s'" msgstr "expansion à « %s »\n" -#: ../commands.cc:426 -#, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" +#: commands.cc:451 +#, fuzzy, c-format +msgid "selection '%s' has multiple ambiguous expansions:" msgstr "la sélection « %s » a plusieurs expansions ambiguës : \n" -#: ../commands.cc:443 +#: commands.cc:468 msgid "note: " msgstr "note : " -#: ../commands.cc:444 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -2385,74 +1946,80 @@ msgstr "" "la branche « %s » a plusieurs heads\n" "vous devriez peut-être lancer « %s merge »" -#: ../commands.cc:458 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message et --message-file sont mutuellement exclusifs" -#: ../database_check.cc:129 +#: database_check.cc:137 #, c-format msgid "file structure is corrupted; cannot check further" msgstr "" "la structure du fichier est corrompue; impossible de faire plus de " "vérifications" -#: ../database_check.cc:140 +#: database_check.cc:148 msgid "files" msgstr "fichiers" -#: ../database_check.cc:169 +#: database_check.cc:177 msgid "rosters" msgstr "listes" -#: ../database_check.cc:227 +#: database_check.cc:235 msgid "markings" msgstr "marquages" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:298 ../netsync.cc:2967 ../rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 msgid "revisions" msgstr "révisions" -#: ../database_check.cc:393 +#: database_check.cc:401 msgid "ancestry" msgstr "ancêtre" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../database_check.cc:426 ../netsync.cc:2971 +#: database_check.cc:434 netsync.cc:2973 msgid "keys" msgstr "clefs" -#: ../database_check.cc:452 +#: database_check.cc:460 msgid "certs" msgstr "certifs" -#: ../database_check.cc:489 +#: database_check.cc:504 +msgid "heights" +msgstr "" + +#: database_check.cc:548 +msgid "height relations" +msgstr "" + +#: database_check.cc:594 #, c-format msgid "file %s missing (%d manifest references)" msgstr "fichier %s manquant (%d références du manifeste)" -#: ../database_check.cc:496 +#: database_check.cc:601 #, c-format msgid "file %s unreferenced" msgstr "fichier %s non-référencé" -#: ../database_check.cc:515 +#: database_check.cc:620 #, c-format msgid "roster %s unreferenced" msgstr "liste %s non-référencée" -#: ../database_check.cc:521 +#: database_check.cc:626 #, c-format msgid "roster %s incomplete (%d missing files)" msgstr "liste %s incomplète (%d fichiers manquants)" -#: ../database_check.cc:528 +#: database_check.cc:633 #, c-format msgid "roster %s incomplete (%d missing revisions)" msgstr "liste %s incomplète (%d révisions manquantes)" -#: ../database_check.cc:553 +#: database_check.cc:658 #, c-format msgid "" "revision %s missing (%d revision references; %d cert references; %d parent " @@ -2461,207 +2028,238 @@ 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)" -#: ../database_check.cc:561 +#: database_check.cc:666 #, c-format msgid "revision %s incomplete (%d missing manifests)" msgstr "révision %s incomplète (%d manifestes manquants)" -#: ../database_check.cc:568 +#: database_check.cc:673 #, c-format msgid "revision %s incomplete (%d missing revisions)" msgstr "révision %s incomplète (%d révisions manquantes)" -#: ../database_check.cc:575 +#: database_check.cc:680 #, c-format msgid "revision %s incomplete (missing roster)" msgstr "révision %s incomplète (la liste manque)" -#: ../database_check.cc:581 +#: database_check.cc:686 #, c-format msgid "revision %s mismatched roster and manifest" msgstr "" "la liste et la manifeste de la révision %s ne s'entre-correspondent pas" -#: ../database_check.cc:587 +#: database_check.cc:692 #, c-format msgid "revision %s incomplete (incomplete roster)" msgstr "révision %s incomplète (liste incomplète)" -#: ../database_check.cc:593 +#: database_check.cc:698 #, fuzzy, c-format msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)" msgstr "" "révision %s a des parents non-correspondents (%d parents; %d révision " "référencées)\n" -#: ../database_check.cc:602 +#: database_check.cc:707 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)" -msgstr "" -"révision %s a des enfants non-correspondant (%d enfants; %d parents)" +msgstr "révision %s a des enfants non-correspondant (%d enfants; %d parents)" -#: ../database_check.cc:614 +#: database_check.cc:719 #, fuzzy, c-format msgid "revision %s has bad history (%s)" msgstr "la révision %s a une mauvaise histoire (%s)\n" -#: ../database_check.cc:621 +#: database_check.cc:726 #, fuzzy, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)" msgstr "" "la révision %s n'est pas analysable (peut-être a-t'elle des chemins non " "normalisé?)\n" -#: ../database_check.cc:628 +#: database_check.cc:733 #, c-format msgid "revision %s is not in normalized form" msgstr "la révision %s n'est pas en forme normalisée" -#: ../database_check.cc:652 +#: database_check.cc:757 #, c-format msgid "key %s missing (signed %d certs)" msgstr "la clef %s est manquante (elle a signé %d certifs)" -#: ../database_check.cc:685 +#: database_check.cc:790 #, fuzzy, c-format msgid "revision %s unchecked signature in %s cert from missing key %s" 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:693 +#: database_check.cc:798 #, fuzzy, c-format msgid "revision %s bad signature in %s cert from key %s" msgstr "" "la révision %s a une mauvaise signature dans le certif %s, faite avec la " "clef %s\n" -#: ../database_check.cc:708 +#: database_check.cc:813 #, fuzzy, c-format msgid "revision %s missing %s cert" msgstr "la révision %s manque le certif %s\n" -#: ../database_check.cc:717 +#: database_check.cc:822 #, fuzzy, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)" msgstr "" "révision %s a des certifs non-correspondant (%d auteurs %d dates %d entrées " "de journal)\n" -#: ../database_check.cc:797 +#: database_check.cc:846 +#, fuzzy, c-format +msgid "height missing for revision %s" +msgstr "%d révisions manquantes" + +#: database_check.cc:853 +#, fuzzy, c-format +msgid "duplicate height for revision %s" +msgstr "mise à jour vers la révision de base %s" + +#: database_check.cc:859 #, c-format +msgid "height of revision %s not greater than that of parent" +msgstr "" + +#: database_check.cc:944 +#, c-format msgid "%d missing files" msgstr "%d fichiers manquants" -#: ../database_check.cc:799 +#: database_check.cc:946 #, c-format msgid "%d unreferenced files" msgstr "%d fichiers non-référencés" -#: ../database_check.cc:802 +#: database_check.cc:949 #, c-format msgid "%d unreferenced rosters" msgstr "%d listes non-référencées" -#: ../database_check.cc:804 +#: database_check.cc:951 #, c-format msgid "%d incomplete rosters" msgstr "%d listes incomplètes" -#: ../database_check.cc:807 +#: database_check.cc:954 #, c-format msgid "%d missing revisions" msgstr "%d révisions manquantes" -#: ../database_check.cc:809 +#: database_check.cc:956 #, c-format msgid "%d incomplete revisions" msgstr "%d révisions incomplètes" -#: ../database_check.cc:811 +#: database_check.cc:958 #, c-format msgid "%d mismatched parents" msgstr "%d parents non correspondants" -#: ../database_check.cc:813 +#: database_check.cc:960 #, c-format msgid "%d mismatched children" msgstr "%d enfants non correspondants" -#: ../database_check.cc:815 +#: database_check.cc:962 #, c-format msgid "%d revisions with bad history" msgstr "%d révisions avec un mauvais historique" -#: ../database_check.cc:817 +#: database_check.cc:964 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)" msgstr "" "%d révisions non analysables (peut-être ont-elles des chemins invalides ?)" -#: ../database_check.cc:820 +#: database_check.cc:967 #, c-format msgid "%d revisions not in normalized form" msgstr "%d révisions non normalisées" -#: ../database_check.cc:824 +#: database_check.cc:971 #, c-format msgid "%d missing rosters" msgstr "%d listes manquantes" -#: ../database_check.cc:828 +#: database_check.cc:975 #, c-format msgid "%d missing keys" msgstr "%d clefs manquantes" -#: ../database_check.cc:831 +#: database_check.cc:978 #, c-format msgid "%d missing certs" msgstr "%d certifs manquants" -#: ../database_check.cc:833 +#: database_check.cc:980 #, c-format msgid "%d mismatched certs" msgstr "%d certifs non correspondants" -#: ../database_check.cc:835 +#: database_check.cc:982 #, c-format msgid "%d unchecked signatures due to missing keys" msgstr "%d signature non contrôlées à cause de clefs manquantes" -#: ../database_check.cc:837 +#: database_check.cc:984 #, c-format msgid "%d bad signatures" msgstr "%d mauvaises signatures" -#: ../database_check.cc:861 +#: database_check.cc:987 +#, fuzzy, c-format +msgid "%d missing heights" +msgstr "%d certifs manquants" + +#: database_check.cc:989 #, c-format -msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs" +msgid "%d duplicate heights" msgstr "" + +#: database_check.cc:991 +#, fuzzy, c-format +msgid "%d incorrect heights" +msgstr "%d révisions incomplètes" + +#: database_check.cc:1017 +#, fuzzy, c-format +msgid "" +"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d " +"heights" +msgstr "" "vérification terminée : %d fichiers; %d listes; %d révisions; %d clefs; %d " "certifs" -#: ../database_check.cc:867 +#: database_check.cc:1024 #, c-format msgid "total problems detected: %d (%d serious)" msgstr "total problèmes détectés: %d (%d sérieux)" -#: ../database_check.cc:869 +#: database_check.cc:1026 #, c-format msgid "serious problems detected" msgstr "problèmes sérieux détectés" -#: ../database_check.cc:871 +#: database_check.cc:1028 #, c-format msgid "minor problems detected" msgstr "problèmes mineurs détectés" -#: ../database_check.cc:873 +#: database_check.cc:1030 #, c-format msgid "database is good" msgstr "la base de données est bonne" -#: ../database.cc:158 +#: database.cc:159 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -2676,12 +2274,12 @@ msgstr "" "(cette opération est irréversible; vous voudrez probablement prendre une " "copie d'abord)" -#: ../database.cc:172 +#: database.cc:173 #, c-format msgid "this database already contains rosters" msgstr "cette base de données contient déjà des listes" -#: ../database.cc:196 +#: database.cc:200 #, fuzzy, c-format msgid "" "database %s contains old-style revisions\n" @@ -2700,7 +2298,7 @@ msgstr "" " récupérez de nouveau dans une nouvelle base de données.\n" "désolé pour le dérangement." -#: ../database.cc:206 +#: database.cc:210 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -2708,31 +2306,29 @@ msgstr "" "please see README.changesets for details" msgstr "" "la base de données %s contient des manifestes mais aucune révision\n" -"ceci est un base de données très ancienne; elle a besoin d'être mise à " -"jour\n" +"ceci est un base de données très ancienne; elle a besoin d'être mise à jour\n" "veuillez lire les détails dans README.changesets" -#: ../database.cc:217 +#: database.cc:221 #, c-format msgid "" -"database %s contains revisions but no rosters\n" -"probably this is because an upgrade cleared the roster cache\n" -"run '%s db regenerate_rosters' to restore use of this database" +"database %s misses some cached data\n" +"run '%s db regenerate_caches' to restore use of this database" msgstr "" -#: ../database.cc:256 +#: database.cc:259 #, 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:263 +#: database.cc:266 #, 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:292 ../schema_migration.cc:201 +#: database.cc:293 schema_migration.cc:201 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -2740,8 +2336,7 @@ msgstr "" "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:298 ../schema_migration.cc:206 +#: database.cc:297 schema_migration.cc:206 #, c-format msgid "" "sqlite error: %s\n" @@ -2750,12 +2345,12 @@ msgstr "" "erreur sqlite : %s\n" "%s" -#: ../database.cc:343 +#: database.cc:342 #, 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:348 +#: database.cc:347 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2763,12 +2358,12 @@ msgstr "" "cancelling database creation" msgstr "" -#: ../database.cc:498 +#: database.cc:497 #, c-format msgid "cannot create %s; it already exists" msgstr "impossible de créer %s car ceci existe déjà" -#: ../database.cc:575 +#: database.cc:574 #, fuzzy, c-format msgid "" "schema version : %s\n" @@ -2789,10 +2384,11 @@ msgid "" " revisions : %u\n" " cached ancestry : %u\n" " certs : %u\n" +" heights : %u\n" " total : %u\n" "database:\n" " page size : %u\n" -" cache size : %u\n" +" cache size : %u" msgstr "" "version du schéma : %s\n" "comptes:\n" @@ -2813,80 +2409,80 @@ msgstr "" " certifs : %u\n" " total : %u\n" -#: ../database.cc:637 +#: database.cc:639 #, c-format msgid "database schema version: %s" msgstr "version du schéma de la base de données : %s" -#: ../database.cc:714 -#, c-format -msgid "multiple statements in query: %s\n" +#: database.cc:716 +#, fuzzy, c-format +msgid "multiple statements in query: %s" msgstr "plusieurs instructions dans la requête: %s\n" -#: ../database.cc:720 +#: database.cc:722 #, fuzzy, c-format msgid "wanted %d columns got %d in query: %s" msgstr "voulais %d colonnes, reçu %d dans la requête: %s\n" -#: ../database.cc:786 +#: database.cc:788 #, fuzzy, c-format msgid "null result in query: %s" msgstr "la requête donnait aucun résultat: %s\n" -#: ../database.cc:804 +#: database.cc:806 #, fuzzy, c-format msgid "wanted %d rows got %d in query: %s" msgstr "voulais %d rangs, reçu %s dans la requête: %s\n" -#: ../database.cc:1951 +#: database.cc:2040 #, c-format msgid "another key with name '%s' already exists" msgstr "une autre clef nommée « %s » existe déjà" -#: ../database.cc:2948 +#: database.cc:3037 #, c-format msgid "no database specified" msgstr "aucune base de données n'a été spécifiée" -#: ../database.cc:2956 +#: database.cc:3045 #, c-format msgid "database %s does not exist" msgstr "la base de données %s n'existe pas" -#: ../database.cc:2957 +#: database.cc:3046 #, c-format msgid "%s is a directory, not a database" msgstr "%s est un dossier, pas une base de données" -#: ../database.cc:2982 +#: database.cc:3071 #, c-format msgid "could not open database '%s': %s" msgstr "impossible d'ouvrir la base de données « %s » : %s" -#: ../diff_patch.cc:614 +#: diff_patch.cc:614 #, c-format msgid "file '%s' does not exist in workspace" msgstr "le fichier « %s » n'existe pas dans l'espace de travail" -#: ../diff_patch.cc:615 +#: diff_patch.cc:615 #, c-format msgid "'%s' in workspace is a directory, not a file" msgstr "« %s » est un dossier, pas un fichier" -#: ../diff_patch.cc:619 +#: diff_patch.cc:619 #, c-format msgid "file %s in workspace has id %s, wanted %s" msgstr "" "le fichier « %s » dans l'espace de travail a l'identité %s, je voulais %s" -#: ../diff_patch.cc:744 -#, c-format +#: diff_patch.cc:744 +#, fuzzy, c-format msgid "" "help required for 3-way merge\n" "[ancestor] %s\n" "[ left] %s\n" "[ right] %s\n" -"[ merged] %s\n" +"[ merged] %s" msgstr "" "aide requise pour la fusion de 3 fichiers\n" "[ ancêtre] %s\n" @@ -2894,7 +2490,7 @@ msgstr "" "[ droite] %s\n" "[fusionné] %s\n" -#: ../file_io.cc:176 ../file_io.cc:183 +#: file_io.cc:176 file_io.cc:183 #, c-format msgid "" "could not create directory '%s'\n" @@ -2903,7 +2499,7 @@ msgstr "" "impossible de créer le dossier « %s »\n" "car c'est un fichier" -#: ../file_io.cc:178 +#: file_io.cc:178 #, c-format msgid "" "could not create directory '%s'\n" @@ -2912,17 +2508,17 @@ msgstr "" "impossible de créer le dossier « %s »\n" "%s" -#: ../file_io.cc:182 +#: file_io.cc:182 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le dossier « %s »" -#: ../file_io.cc:195 +#: file_io.cc:195 #, c-format msgid "failed to create directory '%s' for '%s'" msgstr "impossible de créer le dossier « %s » pour « %s »" -#: ../file_io.cc:209 +#: file_io.cc:209 #, c-format msgid "" "could not remove '%s'\n" @@ -2931,229 +2527,213 @@ msgstr "" "impossible de supprimer « %s »\n" "%s" -#: ../file_io.cc:219 +#: file_io.cc:219 #, c-format msgid "file to delete '%s' does not exist" msgstr "le fichier à supprimer « %s » n'existe pas" -#: ../file_io.cc:220 +#: file_io.cc:220 #, 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:228 +#: file_io.cc:228 #, c-format msgid "directory to delete '%s' does not exist" msgstr "le dossier à supprimer « %s » n'existe pas" -#: ../file_io.cc:229 +#: file_io.cc:229 #, 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:236 +#: file_io.cc:236 #, c-format msgid "object to delete, '%s', does not exist" msgstr "l'objet à supprimer « %s » n'existe pas" -#: ../file_io.cc:244 +#: file_io.cc:244 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "le dossier à supprimer « %s » n'existe pas" -#: ../file_io.cc:245 +#: file_io.cc:245 #, c-format msgid "directory to delete, '%s', is a file" msgstr "le dossier à supprimer « %s » est un fichier" -#: ../file_io.cc:254 +#: file_io.cc:254 #, c-format msgid "rename source file '%s' does not exist" msgstr "le chemin à renommer « %s » n'existe pas" -#: ../file_io.cc:255 +#: file_io.cc:255 #, 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?" -#: ../file_io.cc:258 ../file_io.cc:271 +#: file_io.cc:258 file_io.cc:271 #, c-format msgid "rename target '%s' already exists" msgstr "le nouveau nom « %s » existe déjà" -#: ../file_io.cc:267 +#: file_io.cc:267 #, c-format msgid "rename source dir '%s' does not exist" msgstr "le dossier à renommer « %s » n'existe pas" -#: ../file_io.cc:268 +#: file_io.cc:268 #, 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?" -#: ../file_io.cc:282 +#: file_io.cc:282 #, c-format msgid "rename source path '%s' does not exist" msgstr "le chemin à renommer « %s » n'existe pas" -#: ../file_io.cc:297 +#: file_io.cc:297 #, c-format msgid "file %s does not exist" msgstr "le fichier %s n'existe pas" -#: ../file_io.cc:298 +#: file_io.cc:298 #, 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:302 +#: file_io.cc:302 #, c-format msgid "cannot open file %s for reading" msgstr "impossible d'ouvrir le fichier %s pour le lire" -#: ../file_io.cc:341 +#: file_io.cc:341 #, c-format msgid "Cannot read standard input multiple times" msgstr "Impossible de lire l'entrée standard plusieurs fois" -#: ../file_io.cc:372 +#: file_io.cc:372 #, 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:380 +#: file_io.cc:380 #, c-format msgid "cannot open file %s for writing" msgstr "impossible d'ouvrir le fichier %s pour l'écrire" -#. This arguably has broken charset handling too... -#: ../file_io.cc:437 +#: file_io.cc:437 #, c-format msgid "caught runtime error %s constructing file path for %s" msgstr "" "une erreur d'exécution %s est survenue au milieu de la construction du " "chemin de fichier pour %s" -#: ../file_io.cc:530 +#: file_io.cc:530 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "aucun fichier ou dossier de ce type : « %s »" -#: ../keys.cc:102 +#: keys.cc:102 #, c-format msgid "got empty passphrase from get_passphrase() hook" msgstr "la phrase de passe obtenue depuis get_passphrase() est vide" -#: ../keys.cc:118 +#: keys.cc:118 #, c-format msgid "empty passphrase not allowed" msgstr "la phrase de passe ne doit pas être vide" -#: ../keys.cc:125 +#: keys.cc:125 #, c-format msgid "confirm passphrase for key ID [%s]: " msgstr "confirmez la phrase de passe pour la clef d'ID [%s] :" -#: ../keys.cc:130 +#: keys.cc:130 #, c-format msgid "empty passphrases not allowed, try again" msgstr "la phrase de passe ne doit pas être vide, essayez de nouveau" -#: ../keys.cc:131 ../keys.cc:138 +#: keys.cc:131 keys.cc:138 #, c-format msgid "too many failed passphrases" msgstr "trop de phrases de passe incorrectes" -#: ../keys.cc:137 +#: keys.cc:137 #, c-format msgid "passphrases do not match, try again" msgstr "les phrases de passe ne correspondent pas, essayez à nouveau" -#: ../keys.cc:144 +#: keys.cc:144 #, c-format msgid "no passphrase given" msgstr "aucune phrase de passe fournie" -#: ../keys.cc:570 +#: keys.cc:570 #, c-format msgid "passphrase for '%s' is incorrect" msgstr "la phrase de passe pour « %s » est incorrecte" -#: ../lua.cc:462 ../lua.cc:476 +#: lua.cc:462 lua.cc:476 #, c-format msgid "%s called with an invalid parameter" msgstr "%s a été appelé avec un paramètre invalide" -#: ../lua.cc:479 +#: lua.cc:479 #, c-format msgid "Directory '%s' does not exist" msgstr "le dossier « %s » n'existe pas" -#: ../lua.cc:480 ../rcs_import.cc:1235 ../work.cc:1316 +#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "« %s » n'est pas un dossier" -#: ../lua.cc:499 +#: lua.cc:499 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "erreur lua lors du chargement de « %s »" -#: ../merge.cc:60 +#: merge.cc:60 #, c-format msgid "resolve non-content conflicts and then try again." msgstr "résolvez les conflits ne concernant pas le contenu et ré-essayer." -#: ../merge.cc:124 -#, c-format -msgid "merge failed due to unresolved conflicts\n" +#: merge.cc:124 +#, fuzzy, c-format +msgid "merge failed due to unresolved conflicts" msgstr "la fusion a échouée à cause de conflits non-résolus\n" -#: ../merkle_tree.cc:290 +#: merkle_tree.cc:290 #, c-format msgid "node level is %d, exceeds maximum %d" msgstr "niveau de nœud est %d, ce qui dépasse la limite %d" -#: ../merkle_tree.cc:325 +#: merkle_tree.cc:325 #, 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:153 +#: monotone.cc:274 #, c-format -msgid "Invalid escape in --xargs file" -msgstr "" - -#: ../monotone.cc:665 -#, c-format -msgid "%s:\n" -msgstr "%s :\n" - -#: ../monotone.cc:673 -#, c-format -msgid "%s" -msgstr "%s" - -#: ../monotone.cc:683 -#, c-format msgid "Usage: %s [OPTION...] command [ARG...]" msgstr "Utilisation : %s [OPTION...] commande [ARGUMENTS...]" -#: ../monotone.cc:691 +#: monotone.cc:282 #, c-format msgid "Options specific to '%s %s':" msgstr "Options spécifiques à « %s %s » :" -#: ../mt_version.cc:36 +#: mt_version.cc:36 #, c-format msgid "%s (base revision: %s)" msgstr "%s (révision de base : %s)" -#: ../mt_version.cc:56 +#: mt_version.cc:56 #, c-format msgid "" "Running on : %s\n" @@ -3170,17 +2750,17 @@ msgstr "" "Changements depuis la révision de base :\n" "%s" -#: ../netcmd.cc:43 +#: netcmd.cc:43 #, c-format msgid "unknown item type 0x%x for '%s'" msgstr "type d'élément inconnu 0x%x pour « %s »" -#: ../netcmd.cc:115 +#: netcmd.cc:115 #, c-format msgid "unknown netcmd code 0x%x" msgstr "code de commande netcmd inconnu 0x%x" -#: ../netcmd.cc:120 +#: netcmd.cc:120 #, c-format msgid "" "protocol version mismatch: wanted '%d' got '%d'\n" @@ -3189,112 +2769,106 @@ msgstr "" "discordance de versions de protocoles: attendu « %d », reçu « %d »\n" "%s" -#: ../netcmd.cc:125 +#: netcmd.cc:125 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:126 +#: netcmd.cc:126 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:136 +#: netcmd.cc:136 #, c-format msgid "oversized payload of '%d' bytes" msgstr "charge utile sur-dimensionnée de '%d' octets" -#: ../netcmd.cc:176 -#, c-format +#: netcmd.cc:176 +#, fuzzy, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" -"this suggests data was corrupted in transit\n" +"this suggests data was corrupted in transit" msgstr "" "mauvaise somme de contrôle HMAC (reçu %s, attendu %s)\n" "ceci suggère que les données ont été corrompues pendant le transit\n" -#: ../netcmd.cc:272 ../netcmd.cc:318 +#: netcmd.cc:272 netcmd.cc:318 #, c-format msgid "unknown role specifier %d" msgstr "rôle donné %d est inconnu" -#: ../netio.hh:41 ../netio.hh:59 +#: netio.hh:41 netio.hh:59 #, 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:87 ../netio.hh:122 +#: netio.hh:87 netio.hh:122 #, 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:142 +#: netio.hh:142 #, 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" -#: ../netio.hh:278 +#: netio.hh:278 #, 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:333 +#: netio.hh:333 #, 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:258 +#: netsync.cc:258 #, 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:724 +#: netsync.cc:724 msgid "bytes in" msgstr "octets entrants" # msgstr "octets ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:726 +#: netsync.cc:726 msgid "bytes out" msgstr "octets sortants" # msgstr "octets ⇧" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:730 +#: netsync.cc:730 msgid "certs in" msgstr "certifs entrants" # msgstr "certs ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:732 ../netsync.cc:745 +#: netsync.cc:732 netsync.cc:745 msgid "revs in" msgstr "révs entrantes" # msgstr "révs ⇩" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:737 +#: netsync.cc:737 msgid "certs out" msgstr "certifs entrants" # msgstr "certs ⇧" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:739 ../netsync.cc:747 +#: netsync.cc:739 netsync.cc:747 msgid "revs out" msgstr "révs sortantes" # msgstr "révs ⇧" -#: ../netsync.cc:853 +#: netsync.cc:853 #, c-format msgid "underflow on count of %s items to receive" msgstr "trop peux d'objets %s à recevoir" -#: ../netsync.cc:1201 +#: netsync.cc:1201 #, c-format msgid "received network error: %s" msgstr "erreur de réception réseau : %s" -#: ../netsync.cc:1236 +#: netsync.cc:1236 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -3317,70 +2891,69 @@ msgstr "" "j'attendais %s\n" "« %s unset %s %s » pour passer outre cette vérification" -#: ../netsync.cc:1246 +#: netsync.cc:1246 #, c-format msgid "server key changed" msgstr "la clef du serveur a changé" -#: ../netsync.cc:1251 -#, c-format +#: netsync.cc:1251 +#, fuzzy, c-format msgid "" "first time connecting to server %s\n" "I'll assume it's really them, but you might want to double-check\n" -"their key's fingerprint: %s\n" +"their key's fingerprint: %s" msgstr "" "Première connexion au serveur %s\n" "Je considère qu'il s'agit vraiment de lui, mais vous devriez peut-être\n" "re-vérifier l'empreinte de leur clef : %s\n" -#: ../netsync.cc:1258 +#: netsync.cc:1258 #, c-format msgid "saving public key for %s to database" msgstr "enregistrement de la clef publique « %s » dans la base de données" -#: ../netsync.cc:1352 +#: netsync.cc:1352 #, c-format msgid "rejected attempt at anonymous connection for write" msgstr "tentative de connexion anonyme pour écrire rejeté" -#: ../netsync.cc:1358 +#: netsync.cc:1358 #, fuzzy, c-format msgid "rejected attempt at anonymous connection while running as sink" msgstr "tentative de connexion anonyme en étant un puits rejeté" -#: ../netsync.cc:1372 ../netsync.cc:1496 +#: netsync.cc:1372 netsync.cc:1496 #, c-format msgid "not serving branch '%s'" msgstr "la branche « %s » n'est pas servie" -#: ../netsync.cc:1377 +#: netsync.cc:1377 #, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "accès anonyme à la branche « %s » refusé par le serveur" -#: ../netsync.cc:1385 +#: netsync.cc:1385 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'" -msgstr "" -"permission de lecture anonyme accordée pour « %s » en excluant « %s »" +msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »" -#: ../netsync.cc:1391 +#: netsync.cc:1391 #, c-format msgid "allowed anonymous read/write permission for '%s' excluding '%s'" -msgstr "" -"permission de lecture anonyme accordée pour « %s » en excluant « %s »" +msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »" -#: ../netsync.cc:1447 +#: netsync.cc:1447 #, fuzzy, c-format msgid "detected replay attack in auth netcmd" -msgstr "une attaque de type re-jeu a été détectée dans la phase auth de netcmd\n" +msgstr "" +"une attaque de type re-jeu a été détectée dans la phase auth de netcmd\n" -#: ../netsync.cc:1468 +#: netsync.cc:1468 #, c-format msgid "remote public key hash '%s' is unknown" msgstr "la somme de contrôle « %s » d'une clef publique reçu est inconnue" -#: ../netsync.cc:1484 +#: netsync.cc:1484 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " @@ -3389,7 +2962,7 @@ msgstr "" "permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en " "étant un puits pure" -#: ../netsync.cc:1501 +#: netsync.cc:1501 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" @@ -3397,664 +2970,657 @@ msgstr "" "permission de lecture refusée à « %s » pour « %s » en excluant « %s » à " "cause de la branche « %s »" -#. If we're source_and_sink_role, continue even with no branches readable -#. eg. serve --db=empty.db -#: ../netsync.cc:1511 +#: netsync.cc:1511 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'" -msgstr "" -"permission de lecture accordée à « %s » pour « %s » en excluant « %s »" +msgstr "permission de lecture accordée à « %s » pour « %s » en excluant « %s »" -#: ../netsync.cc:1521 +#: netsync.cc:1521 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " "source" msgstr "" -"permission d'écriture refusée à « %s » pour « %s » en excluant « %s » en étant " -"un source pure" +"permission d'écriture refusée à « %s » pour « %s » en excluant « %s » en " +"étant un source pure" -#: ../netsync.cc:1528 +#: netsync.cc:1528 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'" msgstr "permission d'écrire refusée à « %s » pour « %s » en excluant « %s »" -#: ../netsync.cc:1532 +#: netsync.cc:1532 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'" msgstr "permission d'écrire accordée à « %s » pour « %s » en excluant « %s »" -#: ../netsync.cc:1556 +#: netsync.cc:1556 #, c-format msgid "bad client signature" msgstr "signature du client invalide" -#: ../netsync.cc:1572 +#: netsync.cc:1572 #, fuzzy, c-format msgid "Unexpected 'refine' command on non-refined item type" msgstr "Commande « refine » inattenue pour type d'objet non raffiné\n" -#: ../netsync.cc:1669 +#: netsync.cc:1669 #, c-format msgid "unknown bye phase %d received" msgstr "phase d'aurevoir %d inconnue reçue" -#: ../netsync.cc:1684 +#: netsync.cc:1684 #, fuzzy, c-format msgid "Unexpected 'done' command on non-refined item type" msgstr "Commande « done » inattenue pour type d'objet non raffiné\n" -#: ../netsync.cc:1756 +#: netsync.cc:1756 #, fuzzy, c-format msgid "%s 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" -#. 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:1857 +#: netsync.cc:1859 #, 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 »." -#: ../netsync.cc:1875 +#: netsync.cc:1877 #, 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 »" -#: ../netsync.cc:1889 +#: netsync.cc:1891 #, 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 »" -#: ../netsync.cc:1951 +#: netsync.cc:1953 #, c-format msgid "Received warning from usher: %s" msgstr "Alerte reçu de usher : %s" -#: ../netsync.cc:2038 ../netsync.cc:2069 +#: netsync.cc:2040 netsync.cc:2071 msgid "source and sink" msgstr "source et puits" -#: ../netsync.cc:2039 ../netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "source" msgstr "source" -#: ../netsync.cc:2039 ../netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "sink" msgstr "puits" -#: ../netsync.cc:2226 -#, c-format -msgid "input buffer for peer %s is overfull after netcmd dispatch\n" +#: netsync.cc:2228 +#, fuzzy, c-format +msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "" "le tampon d'entrée pour le pair %s est plus que plein après la répartition " "netcmd\n" -#: ../netsync.cc:2238 ../netsync.cc:2337 +#: netsync.cc:2240 netsync.cc:2339 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n" -#: ../netsync.cc:2244 +#: netsync.cc:2246 #, c-format msgid "error: %s" msgstr "erreur : %s" -#. FIXME: split into labels and convert to ace here. -#: ../netsync.cc:2308 +#: netsync.cc:2310 #, c-format msgid "connecting to %s" msgstr "connexion à %s" -#: ../netsync.cc:2352 -#, c-format -msgid "timed out waiting for I/O with peer %s, disconnecting\n" +#: netsync.cc:2354 +#, fuzzy, c-format +msgid "timed out waiting for I/O with peer %s, disconnecting" msgstr "temps mort en attendant E/S du pair %s, déconnexion\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:2375 -#, c-format -msgid "processing failure while talking to peer %s, disconnecting\n" +#: netsync.cc:2377 +#, fuzzy, c-format +msgid "processing failure while talking to peer %s, disconnecting" msgstr "échec du traitement pendant le dialogue avec le pair %s, déconnexion\n" -#: ../netsync.cc:2392 +#: netsync.cc:2394 #, c-format msgid "successful exchange with %s" msgstr "échange réussi avec %s" -#: ../netsync.cc:2398 +#: netsync.cc:2400 #, c-format msgid "peer %s disconnected after we informed them of error" msgstr "le pair %s s'est déconnecté après avoir été informé de l'erreur" -#: ../netsync.cc:2403 -#, c-format -msgid "I/O failure while talking to peer %s, disconnecting\n" +#: netsync.cc:2405 +#, fuzzy, c-format +msgid "I/O failure while talking to peer %s, disconnecting" msgstr "erreur d'E/S pendant le dialogue avec le pair %s, déconnexion\n" -#: ../netsync.cc:2469 +#: netsync.cc:2471 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n" -#: ../netsync.cc:2501 +#: netsync.cc:2503 #, c-format msgid "accepted new client connection from %s : %s" msgstr "nouvelle connexion d'un client acceptée de %s : %s" -#: ../netsync.cc:2538 +#: netsync.cc:2540 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" msgstr "erreur de protocole en communiquant avec le pair %s: « %s »\n" -#: ../netsync.cc:2549 +#: netsync.cc:2551 #, c-format msgid "peer %s read failed in working state (error)" msgstr "" -#: ../netsync.cc:2554 +#: netsync.cc:2556 #, c-format msgid "" -"peer %s read failed in shutdown state (possibly client misreported error)\n" +"peer %s read failed in shutdown state (possibly client misreported error)" msgstr "" -#: ../netsync.cc:2560 +#: netsync.cc:2562 #, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "" -#: ../netsync.cc:2581 +#: netsync.cc:2583 #, c-format msgid "peer %s write failed in working state (error)" msgstr "" -#: ../netsync.cc:2586 +#: netsync.cc:2588 #, c-format msgid "" -"peer %s write failed in shutdown state (possibly client misreported error)\n" +"peer %s write failed in shutdown state (possibly client misreported error)" msgstr "" -#: ../netsync.cc:2592 +#: netsync.cc:2594 #, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "" -#: ../netsync.cc:2619 +#: netsync.cc:2621 #, c-format msgid "peer %s processing finished, disconnecting" msgstr "traitement du pair %s terminé, déconnexion" -#: ../netsync.cc:2641 +#: netsync.cc:2643 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting" msgstr "le fd %d (pair %s) est inactif depuis trop longtemps, déconnexion" -#: ../netsync.cc:2709 +#: netsync.cc:2711 #, c-format msgid "beginning service on %s : %s" msgstr "début du service sur %s : %s" -#: ../netsync.cc:2710 +#: netsync.cc:2712 msgid "" msgstr "" -#: ../netsync.cc:2724 +#: netsync.cc:2726 #, c-format -msgid "session limit %d reached, some connections will be refused\n" +msgid "session limit %d reached, some connections will be refused" msgstr "" -#: ../netsync.cc:2789 +#: netsync.cc:2791 #, c-format msgid "got OOB from peer %s, disconnecting" msgstr "reçu des données hors-bande du pair %s, déconnexion" -#: ../netsync.cc:2849 +#: netsync.cc:2851 #, c-format msgid "beginning service on %s" msgstr "début du service sur %s" -#: ../netsync.cc:2912 +#: netsync.cc:2914 #, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting" msgstr "reçu des données hors-bande sur le fd %d (pair %s), déconnexion" -#: ../netsync.cc:2961 +#: netsync.cc:2963 #, c-format msgid "finding items to synchronize:" msgstr "recherche d'éléments à synchroniser :" -#. xgettext: please use short message and try to avoid multibytes chars -#: ../netsync.cc:2969 +#: netsync.cc:2971 msgid "certificates" msgstr "certificats" -#: ../netsync.cc:3082 +#: netsync.cc:3084 #, c-format msgid "Cannot find key '%s'" msgstr "Impossible de trouver la clef « %s »" -#: ../netsync.cc:3122 -#, c-format +#: netsync.cc:3124 +#, fuzzy, c-format msgid "" "include branch pattern contains a quote character:\n" -"%s\n" +"%s" msgstr "" "le motif des branches à inclure contient un caractère de citation :\n" "%s\n" -#: ../netsync.cc:3128 -#, c-format +#: netsync.cc:3130 +#, fuzzy, c-format msgid "" "exclude branch pattern contains a quote character:\n" -"%s\n" +"%s" msgstr "" "le motif des branches à exclure contient un caractère de citation :\n" "%s\n" -#: ../netsync.cc:3163 ../netsync.cc:3167 +#: netsync.cc:3165 netsync.cc:3169 #, c-format msgid "network error: %s" msgstr "erreur réseau : %s" -#: ../options_list.hh:2 -msgid "print debug log to stderr while running" -msgstr "affiche le journal à déboguer sur la sortie d'erreur standard" +#: options_list.hh:19 +msgid "override author for commit" +msgstr "supplante l'auteur pour confier" -#: ../options_list.hh:3 -msgid "file to dump debugging log to, on failure" -msgstr "ficher dans lequel verser le journal à déboguer, en cas d'erreur" +#: options_list.hh:27 +msgid "block size in bytes for \"automate stdio\" output" +msgstr "la taille de bloc en octets pour la sortie « automate stdio »" -#: ../options_list.hh:4 -msgid "file to write the log to" -msgstr "fichier où écrire le journal" +#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#, fuzzy, c-format +msgid "cannot be zero or negative" +msgstr "argument illégal à --last : il ne doit pas être nul ou négatif\n" -#: ../options_list.hh:5 -#, fuzzy -msgid "suppress verbose, informational and progress messages" -msgstr "n'affiche pas le journal ou les messages de progrès" +#: options_list.hh:43 +msgid "address:port to listen on (default :4691)" +msgstr "écouter sur adresse:port (défaut :4691)" -#: ../options_list.hh:6 -#, fuzzy -msgid "suppress warning, verbose, informational and progress messages" -msgstr "n'affiche pas le journal ou les messages de progrès" +#: options_list.hh:80 +msgid "disable transport authentication" +msgstr "désactiver l'authentification du transport" -#: ../options_list.hh:7 -msgid "display help message" -msgstr "afficher le message d'aide" +#: options_list.hh:87 +msgid "serve netsync on stdio" +msgstr "servir netsync sur stdio" -#: ../options_list.hh:8 -msgid "print version number, then exit" -msgstr "afficher le numéro de version, puis quitte" +#: options_list.hh:96 +msgid "select branch cert for operation" +msgstr "choisi certif de branch pour l'opération" -#: ../options_list.hh:9 -msgid "print detailed version number, then exit" -msgstr "afficher le numéro de version détaillée, puis quitte" +#: options_list.hh:104 +msgid "print a brief version of the normal output" +msgstr "affiche la version courte de l'affichage normale" -#: ../options_list.hh:10 -msgid "insert command line arguments taken from the given file" -msgstr "fourre les arguments pris du fichier donné dans la linge de commande" +#: options_list.hh:112 +msgid "set location of configuration directory" +msgstr "paramétrer l'emplacement du dossier de configuration" -#: ../options_list.hh:11 -msgid "set ticker style (count|dot|none)" -msgstr "établis le style d'affichage de progrès (count|dot|none)" +#: options_list.hh:122 +msgid "override date/time for commit" +msgstr "supplante la date/l'heure pour confier" -#: ../options_list.hh:12 -msgid "do not load standard lua hooks" -msgstr "ne pas charger les hooks standards lua" - -#: ../options_list.hh:13 -msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" -msgstr "" -"ne pas charger les fichiers lua ~/.monotone/monotonerc ou _MTN/monotonerc" - -#: ../options_list.hh:14 -msgid "load extra rc file" -msgstr "charger un fichier rc supplémentaire" - -#: ../options_list.hh:15 -msgid "set key for signatures" -msgstr "paramétrer la clef pour les signatures" - -#: ../options_list.hh:16 +#: options_list.hh:143 msgid "set name of database" msgstr "paramétrer le nom de la base de données" -#: ../options_list.hh:17 -msgid "limit search for workspace to specified root" -msgstr "limite la recherche d'un espace de travail à la racine donnée" +#: options_list.hh:151 +msgid "print debug log to stderr while running" +msgstr "affiche le journal à déboguer sur la sortie d'erreur standard" -# **** Richard stopped here **** -#: ../options_list.hh:18 -msgid "verbose completion output" -msgstr "affiche plus d'information à la fin de l'exécution" +#: options_list.hh:159 +msgid "limit the number of levels of directories to descend" +msgstr "limite le niveau de dossier à descendre" -#: ../options_list.hh:19 -msgid "set location of key store" -msgstr "paramétrer l'emplacement de l'entrepôt des clefs" +#: options_list.hh:164 +#, c-format +msgid "cannot be negative" +msgstr "" -#: ../options_list.hh:20 -msgid "set location of configuration directory" -msgstr "paramétrer l'emplacement du dossier de configuration" +#: options_list.hh:173 +msgid "argument to pass external diff hook" +msgstr "argument a passer la procédure automatique de « diff » externe" -#: ../options_list.hh:22 -msgid "override author for commit" -msgstr "supplante l'auteur pour confier" - -#: ../options_list.hh:23 -msgid "block size in bytes for \"automate stdio\" output" -msgstr "la taille de bloc en octets pour la sortie « automate stdio »" - -#: ../options_list.hh:24 -msgid "address:port to listen on (default :4691)" -msgstr "écouter sur adresse:port (défaut :4691)" - -#: ../options_list.hh:25 -msgid "select branch cert for operation" -msgstr "choisi certif de branch pour l'opération" - -#: ../options_list.hh:26 -msgid "print a brief version of the normal output" -msgstr "affiche la version courte de l'affichage normale" - -#: ../options_list.hh:27 +#: options_list.hh:182 msgid "use context diff format" msgstr "utiliser le format diff contextuel" -#: ../options_list.hh:28 -msgid "override date/time for commit" -msgstr "supplante la date/l'heure pour confier" +#: options_list.hh:189 +msgid "use external diff hook for generating diffs" +msgstr "" +"emploie la procédure automatique de « diff » externe pour créer les " +"différences" -#: ../options_list.hh:29 -msgid "limit the number of levels of directories to descend" -msgstr "limite le niveau de dossier à descendre" +#: options_list.hh:196 +msgid "use unified diff format" +msgstr "utiliser le format diff unifié" -#: ../options_list.hh:30 +#: options_list.hh:204 +msgid "do not show the function containing each block of changes" +msgstr "ne pas afficher la fonction contenant chaque bloc de changement" + +#: options_list.hh:211 msgid "print diffs along with logs" msgstr "affiche la différence en affichant le journal" -#: ../options_list.hh:31 +#: options_list.hh:220 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" -#: ../options_list.hh:32 +#: options_list.hh:228 +msgid "file to dump debugging log to, on failure" +msgstr "ficher dans lequel verser le journal à déboguer, en cas d'erreur" + +#: options_list.hh:237 msgid "leave out anything described by its argument" msgstr "exclus tout ce qui est décrit par l'argument" -#: ../options_list.hh:33 +#: options_list.hh:245 msgid "perform the associated file operation" msgstr "accomplis les opérations sur les fichiers associés" -#: ../options_list.hh:34 -msgid "use external diff hook for generating diffs" -msgstr "" -"emploie la procédure automatique de « diff » externe pour créer les " -"différences" +#: options_list.hh:253 +msgid "print detailed version number, then exit" +msgstr "afficher le numéro de version détaillée, puis quitte" -#: ../options_list.hh:35 -msgid "argument to pass external diff hook" -msgstr "argument a passer la procédure automatique de « diff » externe" +#: options_list.hh:260 +msgid "display help message" +msgstr "afficher le message d'aide" -#: ../options_list.hh:36 +#: options_list.hh:269 +#, fuzzy +msgid "include anything described by its argument" +msgstr "exclus tout ce qui est décrit par l'argument" + +#: options_list.hh:277 +msgid "set key for signatures" +msgstr "paramétrer la clef pour les signatures" + +#: options_list.hh:285 +msgid "set location of key store" +msgstr "paramétrer l'emplacement de l'entrepôt des clefs" + +#: options_list.hh:294 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" -#: ../options_list.hh:37 +#: options_list.hh:304 msgid "limit log output to the last number of entries" msgstr "limiter l'affichage du journal au dernier nombre d'entrées spécifié" -#: ../options_list.hh:38 +#: options_list.hh:313 +msgid "file to write the log to" +msgstr "fichier où écrire le journal" + +#: options_list.hh:324 msgid "set commit changelog message" msgstr "saisir le message du journal" -#: ../options_list.hh:39 +#: options_list.hh:331 +#, fuzzy +msgid "set filename containing commit changelog message" +msgstr "" +"'etablissez le nom du fichier qui contient l'entrée du journal pour confier" + +#: options_list.hh:339 msgid "perform the operations for files missing from workspace" msgstr "" "exécuter les opérations sur les fichiers qui manquent dans l'espace de " "travail" -#: ../options_list.hh:40 -#, fuzzy -msgid "set filename containing commit changelog message" -msgstr "" -"'etablissez le nom du fichier qui contient l'entrée du journal pour confier" - -#: ../options_list.hh:41 +#: options_list.hh:347 msgid "limit log output to the next number of entries" msgstr "limiter l'affichage du journal au prochain nombre d'entrées spécifié" -#: ../options_list.hh:42 +#: options_list.hh:357 msgid "exclude files when printing logs" msgstr "exclure les fichiers en affichant le journal" -#: ../options_list.hh:43 +#: options_list.hh:365 +msgid "do not ignore any files" +msgstr "" + +#: options_list.hh:373 msgid "exclude merges when printing logs" msgstr "exclure les fusions en affichant le journal" -#: ../options_list.hh:44 -msgid "do not show the function containing each block of changes" -msgstr "ne pas afficher la fonction contenant chaque bloc de changement" +#: options_list.hh:381 +msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" +msgstr "" +"ne pas charger les fichiers lua ~/.monotone/monotonerc ou _MTN/monotonerc" -#: ../options_list.hh:45 -msgid "disable transport authentication" -msgstr "désactiver l'authentification du transport" +#: options_list.hh:389 +msgid "do not load standard lua hooks" +msgstr "ne pas charger les hooks standards lua" -#: ../options_list.hh:46 +#: options_list.hh:397 msgid "record process id of server" msgstr "enregistrer l'identifiant du processus serveur" -#: ../options_list.hh:47 +#: options_list.hh:405 +#, fuzzy +msgid "suppress verbose, informational and progress messages" +msgstr "n'affiche pas le journal ou les messages de progrès" + +#: options_list.hh:415 +msgid "load extra rc file" +msgstr "charger un fichier rc supplémentaire" + +#: options_list.hh:423 +#, fuzzy +msgid "suppress warning, verbose, informational and progress messages" +msgstr "n'affiche pas le journal ou les messages de progrès" + +#: options_list.hh:433 msgid "also operate on the contents of any listed directories" msgstr "" -#: ../options_list.hh:48 +#: options_list.hh:442 msgid "select revision id for operation" msgstr "choisir une révision pour l'opération" -#: ../options_list.hh:49 +#: options_list.hh:450 +msgid "limit search for workspace to specified root" +msgstr "limite la recherche d'un espace de travail à la racine donnée" + +#: options_list.hh:458 msgid "use the current arguments as the future default" msgstr "emploie les arguments actuels comme défauts futurs" -#: ../options_list.hh:50 -msgid "serve netsync on stdio" -msgstr "servir netsync sur stdio" +#: options_list.hh:466 +msgid "set ticker style (count|dot|none)" +msgstr "établis le style d'affichage de progrès (count|dot|none)" -#: ../options_list.hh:51 -msgid "use unified diff format" -msgstr "utiliser le format diff unifié" +#: options_list.hh:477 +#, c-format +msgid "argument must be 'none', 'dot', or 'count'" +msgstr "" -#: ../options_list.hh:52 +#: options_list.hh:482 msgid "perform the operations for unknown files from workspace" msgstr "" "accomplis les opérations sur les fichiers inconnus dans l'espace de travail" -#: ../packet.cc:107 +# **** Richard stopped here **** +#: options_list.hh:490 +msgid "verbose completion output" +msgstr "affiche plus d'information à la fin de l'exécution" + +#: options_list.hh:498 +msgid "print version number, then exit" +msgstr "afficher le numéro de version, puis quitte" + +#: options_list.hh:506 +msgid "insert command line arguments taken from the given file" +msgstr "fourre les arguments pris du fichier donné dans la linge de commande" + +#: packet.cc:107 #, c-format msgid "file preimage '%s' missing in db" msgstr "la préimage du fichier « %s » est manquante dans la base de données" -#: ../packet.cc:108 +#: packet.cc:108 #, c-format msgid "dropping delta '%s' -> '%s'" msgstr "supprime le delta « %s » -> « %s »" -#: ../packet.cc:139 +#: packet.cc:139 #, c-format msgid "missing prerequisite revision '%s'" msgstr "la révision prérequise « %s » manque" -#: ../packet.cc:140 ../packet.cc:151 ../packet.cc:167 ../packet.cc:175 +#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175 #, c-format msgid "dropping revision '%s'" msgstr "supprime la révision « %s »" -#: ../packet.cc:150 +#: packet.cc:150 #, c-format msgid "missing prerequisite file '%s'" msgstr "le fichier prérequis « %s » est manquant" -#: ../packet.cc:165 +#: packet.cc:165 #, fuzzy, c-format msgid "missing prerequisite file pre-delta '%s'" msgstr "le fichier préalable « %s » manque\n" -#: ../packet.cc:173 +#: packet.cc:173 #, fuzzy, c-format msgid "missing prerequisite file post-delta '%s'" msgstr "le fichier préalable « %s » manque\n" -#: ../packet.cc:201 +#: packet.cc:201 #, c-format msgid "cert revision '%s' does not exist in db" msgstr "la révision de certif « %s » n'existe pas dans la base de données" -#: ../packet.cc:203 +#: packet.cc:203 #, c-format msgid "dropping cert" msgstr "élimine le certif" -#: ../packet.cc:226 +#: packet.cc:226 #, c-format msgid "key '%s' is not equal to key '%s' in database" msgstr "" "la clef « %s » n'est pas égale à la clef « %s » dans la base de données" -#: ../packet.cc:350 +#: packet.cc:350 #, c-format msgid "malformed packet" msgstr "paquet malformé" -#: ../packet.cc:450 +#: packet.cc:450 #, c-format msgid "unknown packet type: '%s'" msgstr "type de paquet inconnu : « %s »" -#: ../rcs_file.cc:354 +#: rcs_file.cc:354 #, c-format -msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" +msgid "parse failure %d:%d: expecting %s, got %s with value '%s'" msgstr "" -#: ../rcs_file.cc:373 +#: rcs_file.cc:373 #, c-format -msgid "parse failure %d:%d: expecting word '%s'\n" +msgid "parse failure %d:%d: expecting word '%s'" msgstr "" -#: ../rcs_file.cc:388 +#: rcs_file.cc:388 #, c-format -msgid "parse failure %d:%d: expecting word\n" +msgid "parse failure %d:%d: expecting word" msgstr "" -#: ../rcs_import.cc:721 +#: rcs_import.cc:721 #, c-format msgid "parsing RCS file %s" msgstr "analyse du fichier RCS %s" -#: ../rcs_import.cc:724 +#: rcs_import.cc:724 #, c-format msgid "parsed RCS file %s OK" msgstr "analyse du fichier RCS %s OK" -#: ../rcs_import.cc:913 +#: rcs_import.cc:913 #, c-format msgid "error reading RCS file %s: %s" msgstr "erreur lors de la lecture du fichier RCS %s : %s" -#: ../rcs_import.cc:1210 +#: rcs_import.cc:1210 #, 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'être la racine d'un dépôt CVS\n" -"tentative d'importer un module, en employant « cvs_import %s/" +"tentative d'importer un module, en employant « cvs_import %s/" -#: ../rcs_import.cc:1222 +#: rcs_import.cc:1222 #, c-format msgid "need base --branch argument for importing" msgstr "il faut un argument --branch pour importer" -#: ../rcs_import.cc:1234 +#: rcs_import.cc:1234 #, c-format msgid "path %s does not exist" msgstr "le chemin %s n'existe pas" -#: ../rcs_import.cc:1269 +#: rcs_import.cc:1269 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:865 +#: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" msgstr "recherche des fusions bogguées" -#: ../revision.cc:907 +#: revision.cc:883 #, c-format msgid "optimizing out redundant edge %d -> %d" msgstr "" -#: ../revision.cc:916 +#: revision.cc:892 #, fuzzy, c-format msgid "failed to eliminate edge %d -> %d" msgstr "impossible de créer le dossier « %s » pour « %s »" -#: ../revision.cc:927 +#: revision.cc:903 #, c-format msgid "rebuilding %d nodes" msgstr "reconstruit %d nœuds" -#: ../revision.cc:1132 -#, c-format -msgid "Path %s added to child roster multiple times\n" +#: revision.cc:1108 +#, fuzzy, c-format +msgid "Path %s added to child roster multiple times" msgstr "Le chemin %s a été ajouté à la liste fille plusieurs fois\n" -#: ../revision.cc:1145 -#, c-format -msgid "Directory for path %s cannot be added, as there is a file in the way\n" +#: revision.cc:1121 +#, fuzzy, c-format +msgid "Directory for path %s cannot be added, as there is a file in the way" msgstr "" "Le dossier %s ne peut pas être ajouter car il y a un fichier qui fait " "obstacle\n" -#: ../revision.cc:1156 +#: revision.cc:1132 #, c-format msgid "Path %s cannot be added, as there is a directory in the way" msgstr "Le chemin %s ne peut être ajouté, un dossier fait obstacle" -#: ../revision.cc:1159 -#, c-format -msgid "Path %s added twice with differing content\n" +#: revision.cc:1135 +#, fuzzy, c-format +msgid "Path %s added twice with differing content" msgstr "Le chemin %s a été ajouté deux fois avec des contenus différents\n" -#: ../revision.cc:1446 +#: revision.cc:1422 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -4063,35 +3629,40 @@ msgstr "" "seriously, if you'd like to keep it, we're happy to figure out how)" msgstr "" -#: ../revision.cc:1559 +#: revision.cc:1535 #, fuzzy, c-format msgid "converting existing revision graph to new roster-style revisions" msgstr "" "convertis graphe de révisions présent à des nouvelles révision en style " "liste\n" -#: ../revision.cc:1614 +#: revision.cc:1590 #, fuzzy, c-format msgid "rebuilding revision graph from manifest certs" msgstr "" "reconstruit le graphe des révisions à partir des certifs de manifeste\n" -#: ../revision.cc:1647 -#, c-format -msgid "regenerating cached rosters" +#: revision.cc:1668 +#, fuzzy, c-format +msgid "regenerating cached rosters and heights" msgstr "régénération des listes en cache" -#: ../revision.cc:1656 -#, c-format -msgid "calculating rosters to regenerate" -msgstr "calcul des listes à régénérer" - -#: ../revision.cc:1660 +#: revision.cc:1680 msgid "regenerated" msgstr "régénéré" -#: ../revision.cc:1755 +#: revision.cc:1696 +#, fuzzy, c-format +msgid "finished regenerating cached rosters and heights" +msgstr "régénération des listes en cache" + +#: revision.cc:1708 #, c-format +msgid "cached height: %s" +msgstr "" + +#: revision.cc:1791 +#, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" "I only know how to understand the version '1' format\n" @@ -4101,87 +3672,87 @@ msgstr "" "je ne comprend que le format version « 1 »\n" "il faut une version monotone plus nouvelle pour compléter cette opération" -#: ../sanity.cc:148 +#: sanity.cc:148 #, c-format msgid "fatal: formatter failed on %s:%d: %s" msgstr "fatal : le formatteur a échoué à %s:%d : %s" -#: ../sanity.cc:222 +#: sanity.cc:222 msgid "misuse: " msgstr "mauvais usage : " -#: ../sanity.cc:234 +#: sanity.cc:234 msgid "error: " msgstr "erreur :" -#: ../sanity.cc:242 +#: sanity.cc:242 #, c-format msgid "%s:%d: invariant '%s' violated" msgstr "%s:%d : violation de l'invariant « %s »" -#: ../sanity.cc:255 -#, c-format -msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" +#: sanity.cc:255 +#, fuzzy, c-format +msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d" msgstr "" "%s:%d : l'index « %s » = %d dépasse la capacité du vector « %s » dont la " "taille est %d\n" -#: ../sanity.cc:276 -#, c-format -msgid "Current work set: %i items\n" +#: sanity.cc:276 +#, fuzzy, c-format +msgid "Current work set: %i items" msgstr "Ensemble de travail actuel: %i objets\n" -#: ../schema_migration.cc:258 +#: schema_migration.cc:258 #, c-format msgid "calculating necessary migration steps" msgstr "calcule les étapes à passer pour migrer" -#: ../schema_migration.cc:270 +#: schema_migration.cc:270 #, c-format msgid "error at transaction BEGIN statement" msgstr "" -#: ../schema_migration.cc:271 +#: schema_migration.cc:271 #, c-format msgid "migrating data" msgstr "migration des données" -#: ../schema_migration.cc:297 +#: schema_migration.cc:297 #, c-format msgid "migration step failed: %s" msgstr "l'étape de migration a échoué : %s" -#: ../schema_migration.cc:311 +#: schema_migration.cc:311 #, 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:314 +#: schema_migration.cc:314 #, c-format msgid "committing changes to database" msgstr "confie les changements à la base de données" -#: ../schema_migration.cc:316 +#: schema_migration.cc:316 #, c-format msgid "failure on COMMIT" msgstr "COMMIT échoué" -#: ../schema_migration.cc:318 +#: schema_migration.cc:318 #, c-format msgid "optimizing database" msgstr "optimisation de la base de données" -#: ../schema_migration.cc:320 +#: schema_migration.cc:320 #, c-format msgid "error vacuuming after migration" msgstr "" -#: ../schema_migration.cc:323 +#: schema_migration.cc:323 #, c-format msgid "error running analyze after migration" msgstr "erreur en analysant après la migration" -#: ../schema_migration.cc:332 +#: schema_migration.cc:332 #, c-format msgid "" "NOTE: because this database was last used by a rather old version\n" @@ -4189,252 +3760,244 @@ msgstr "" "see the file UPGRADE for instructions on running '%s db %s'" msgstr "" -#: ../schema_migration.cc:339 +#: schema_migration.cc:339 #, c-format msgid "" -"NOTE: this upgrade cleared the roster cache\n" -"you should now run '%s db regenerate_rosters'" +"NOTE: this upgrade cleared monotone's caches\n" +"you should now run '%s db regenerate_caches'" msgstr "" -#: ../schema_migration.cc:352 +#: schema_migration.cc:352 #, 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:357 +#: schema_migration.cc:357 #, fuzzy, c-format msgid "no migration performed; database schema already up-to-date at %s" 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:916 +#: schema_migration.cc:916 #, 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:919 +#: schema_migration.cc:919 #, 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:39 +#: std_hooks.lua:39 msgid "Press enter" msgstr "Appuyez sur entrée" -#: ../std_hooks.lua:41 +#: std_hooks.lua:41 msgid "Press enter when the subprocess has completed" msgstr "Appuyez sur [Entrée] quand le sous-processus s'est terminé" -#. xgettext: gibibytes (2^30 bytes) -#: ../ui.cc:158 +#: ui.cc:158 #, c-format msgid "%.1f G" msgstr "%.1f Gi" -#. xgettext: mebibytes (2^20 bytes) -#: ../ui.cc:164 +#: ui.cc:164 #, c-format msgid "%.1f M" msgstr "%.1f Mi" -#. xgettext: kibibytes (2^10 bytes) -#: ../ui.cc:170 +#: ui.cc:170 #, c-format msgid "%.1f k" msgstr "%.1f Ki" -#: ../ui.cc:183 +#: ui.cc:183 #, c-format msgid "%d/%d" msgstr "%d/%d" -#. xgettext: bytes -#: ../ui.cc:188 +#: ui.cc:188 #, c-format msgid "%d" msgstr "%d" -#: ../ui.cc:466 +#: ui.cc:466 msgid "warning: " msgstr "avertissement : " -#: ../ui.cc:477 +#: ui.cc:477 #, fuzzy, c-format msgid "" "fatal: %s\n" "this is almost certainly a bug in monotone.\n" "please send this error message, the output of '%s --full-version',\n" -"and a description of what you were doing to %s.\n" +"and a description of what you were doing to %s." msgstr "" "néfaste: %s\n" "ceci est presque certainement un bogue dans monotone.\n" "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:512 +#: ui.cc:581 #, c-format -msgid "%s: %s" -msgstr "%s : %s" +msgid "failed to open log file '%s'" +msgstr "Impossible d'ouvrir le fichier journal « %s »" -#: ../ui.cc:581 +#: uri.cc:63 #, c-format -msgid "failed to open log file '%s'" -msgstr "Impossible d'ouvrir le fichier journal « %s »" +msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?" +msgstr "" -#: ../update.cc:72 +#: update.cc:72 #, c-format msgid "failed to decode boolean testresult cert value '%s'" msgstr "impossible de décoder la valeur booléenne « %s » du certif testresult" -#: ../update.cc:166 +#: update.cc:166 #, c-format msgid "cannot determine branch for update" msgstr "impossible de déterminer la branche pour la mise à jour" -#: ../vocab.cc:67 +#: vocab.cc:67 #, c-format msgid "hex encoded ID '%s' size != %d" msgstr "" -#: ../vocab.cc:71 +#: vocab.cc:71 #, c-format msgid "bad character '%c' in id name '%s'" msgstr "caractère invalide « %c » dans le nom de l'id « %s »" -#: ../vocab.cc:81 +#: vocab.cc:81 #, c-format msgid "bad character '%c' in ace string '%s'" msgstr "caractère invalide « %c » dans la chaîne ace « %s »" -#: ../vocab.cc:92 +#: vocab.cc:92 #, c-format msgid "bad character '%c' in symbol '%s'" msgstr "caractère invalide « %c » dans le symbole « %s »" -#: ../vocab.cc:103 +#: vocab.cc:103 #, c-format msgid "bad character '%c' in cert name '%s'" msgstr "caractère invalide « %c » dans le nom du certif « %s »" -#: ../vocab.cc:113 +#: vocab.cc:113 #, c-format msgid "bad character '%c' in key name '%s'" msgstr "caractère invalide « %c » dans le nom de la clef « %s »" -#: ../vocab.cc:128 +#: vocab.cc:128 #, c-format msgid "Invalid key length of %d bytes" msgstr "Longueur de clef invalide de %d octets" -#: ../vocab.cc:143 +#: vocab.cc:143 #, c-format msgid "Invalid hmac length of %d bytes" msgstr "Longueur hmac invalide de %d octets" -#: ../work.cc:88 ../work_migration.cc:180 ../work_migration.cc:200 +#: work.cc:88 work_migration.cc:180 work_migration.cc:200 #, fuzzy, c-format msgid "workspace is corrupt: reading %s: %s" msgstr "l'espace de travail est corrompu : %s n'existe pas" -#: ../work.cc:150 +#: work.cc:150 #, c-format msgid "base revision %s does not exist in database" msgstr "la révision de base %s n'existe pas dans la base de données" -#: ../work.cc:284 +#: work.cc:284 #, c-format msgid "unrecognized key '%s' in options file %s - ignored" msgstr "" -#: ../work.cc:291 +#: work.cc:291 #, fuzzy, c-format msgid "Failed to read options file %s: %s" msgstr "La lecture du fichier d'options « %s » a échouée" -#: ../work.cc:339 +#: work.cc:339 #, fuzzy, c-format msgid "Failed to write options file %s: %s" msgstr "L'écriture du fichier d'options « %s » a échouée" -#: ../work.cc:539 +#: work.cc:541 #, c-format msgid "skipping ignorable file %s" msgstr "omission du fichier %s qui peut être ignoré" -#: ../work.cc:548 +#: work.cc:550 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "omission de %s qui existe déjà dans l'espace de travail" -#: ../work.cc:559 +#: work.cc:561 #, c-format msgid "adding %s to workspace manifest" msgstr "ajouter %s au manifeste de l'espace de travail" -#: ../work.cc:565 +#: work.cc:567 #, c-format msgid "" "cannot add %s, because %s is recorded as a file in the workspace manifest" msgstr "" -#: ../work.cc:680 +#: work.cc:682 #, c-format msgid "dropping %s" msgstr "supprime %s" -#: ../work.cc:691 ../work.cc:702 +#: work.cc:693 work.cc:704 #, c-format msgid "path %s already exists" msgstr "le chemin %s existe déjà" -#: ../work.cc:724 ../work.cc:751 +#: work.cc:726 work.cc:756 #, c-format msgid "adding %s" msgstr "ajout de %s" -#: ../work.cc:740 +#: work.cc:744 #, c-format msgid "path '%s' already exists, cannot create" msgstr "le chemin « %s » existe déjà, ne peux pas le créer" -#: ../work.cc:747 +#: work.cc:752 #, c-format msgid "renaming %s to %s" msgstr "renommage de %s en %s" -#: ../work.cc:782 +#: work.cc:787 #, c-format msgid "file '%s' does not exist" msgstr "le fichier « %s » n'existe pas" -#: ../work.cc:783 +#: work.cc:788 #, c-format msgid "file '%s' is a directory" msgstr "le fichier « %s » est un dossier" -#: ../work.cc:788 +#: work.cc:793 #, 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:789 +#: work.cc:794 #, c-format msgid "modifying %s" msgstr "modification de %s" -#: ../work.cc:974 +#: work.cc:979 #, fuzzy, c-format msgid "missing %s" msgstr "modification de %s" -#: ../work.cc:980 +#: work.cc:985 #, fuzzy, c-format msgid "" "%d missing files; use '%s ls missing' to view\n" @@ -4450,109 +4013,109 @@ msgstr "" "lancer soit « monotone drop FICHIER » pour le supprimer définitivement,\n" "soit « monotone revert FICHIER » pour le restaurer\n" -#: ../work.cc:1113 +#: work.cc:1131 #, c-format msgid "skipping %s, not currently tracked" msgstr "" -#: ../work.cc:1123 +#: work.cc:1141 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "impossible de supprimer %s/, il n'est pas vide" -#: ../work.cc:1134 +#: work.cc:1152 #, c-format msgid "dropping %s from workspace manifest" msgstr "supprimer %s du manifeste de l'espace de travail" -#: ../work.cc:1187 -#, c-format -msgid "destination dir %s/ does not exist in current revision" +#: work.cc:1205 +#, fuzzy, c-format +msgid "destination dir %s/ is not versioned (perhaps add it?)" msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle" -#: ../work.cc:1190 +#: work.cc:1208 #, 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:1200 +#: work.cc:1218 #, c-format msgid "empty path %s is not allowed" msgstr "le chemin vide %s n'est pas permit" -#: ../work.cc:1214 +#: work.cc:1232 #, fuzzy, c-format msgid "%s does not exist in current manifest" msgstr "%s n'existe pas dans la révision actuelle" -#: ../work.cc:1217 +#: work.cc:1235 #, fuzzy, c-format msgid "destination %s already exists in current manifest" msgstr "la destination %s existe déjà dans la révision actuelle" -#: ../work.cc:1223 +#: work.cc:1241 #, fuzzy, c-format msgid "destination directory %s does not exist in current manifest" msgstr "le dossier de destination %s/ n'existe pas dans la révision actuelle" -#: ../work.cc:1225 +#: work.cc:1243 #, fuzzy, c-format msgid "destination directory %s is not a directory" msgstr "la nouvelle racine proposé « %s » n'est pas un dossier" -#: ../work.cc:1234 +#: work.cc:1252 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "renomme %s à %s dans le manifeste de l'espace de travail" -#: ../work.cc:1262 +#: work.cc:1280 #, 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:1266 +#: work.cc:1284 #, 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:1296 +#: work.cc:1314 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" msgstr "" -#: ../work.cc:1298 +#: work.cc:1316 #, 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:1303 +#: work.cc:1321 #, 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:1313 +#: work.cc:1331 #, 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:1319 +#: work.cc:1337 #, c-format msgid "'%s' is in the way" msgstr "« %s » fait obstacle" -#: ../work_migration.cc:62 +#: work_migration.cc:62 #, c-format msgid "workspace required but not found" msgstr "espace de travail requis mais pas trouvé" -#: ../work_migration.cc:71 +#: work_migration.cc:71 #, c-format msgid "_MTN/format should not exist in a format 1 workspace; corrected" msgstr "" "_MTN/format ne devrait pas exister dans un espace de travail au format 1;\n" "corrigé" -#: ../work_migration.cc:108 +#: work_migration.cc:108 #, c-format msgid "" "this workspace's metadata is in format 0. to use this workspace\n" @@ -4563,7 +4126,7 @@ msgstr "" "we apologize for the inconvenience." msgstr "" -#: ../work_migration.cc:117 +#: work_migration.cc:117 #, c-format msgid "" "to use this workspace with this version of monotone, its metadata\n" @@ -4573,44 +4136,73 @@ msgstr "" "with versions of monotone older than %s." msgstr "" -#: ../work_migration.cc:127 ../work_migration.cc:255 +#: work_migration.cc:127 work_migration.cc:255 #, c-format msgid "" "this version of monotone only understands workspace metadata\n" "in formats 0 through %d. your workspace is in format %d.\n" "you need a newer version of monotone to use this workspace." msgstr "" -"Cette version de monotone prends en charge uniquement les " -"méta-données d'espace de travail de format 0 jusqu'à %d. " -"Votre espace de travail est au format %d.\n" -"Vous avez besoin d'une version plus récente de monotone pour " -"utiliser cet espace de travail." +"Cette version de monotone prends en charge uniquement les méta-données " +"d'espace de travail de format 0 jusqu'à %d. Votre espace de travail est au " +"format %d.\n" +"Vous avez besoin d'une version plus récente de monotone pour utiliser cet " +"espace de travail." -#: ../work_migration.cc:156 +#: work_migration.cc:156 #, c-format msgid "" "it is not possible to migrate from workspace format 0 to any\n" "later format. you must delete this workspace and check it out\n" "again. we apologize for the inconvenience." msgstr "" -"Il est impossible de migrer cet espace de travail au format 0 vers " -"un autre format plus récent. Vous devez supprimer cet espace de " -"travail et récupérer à nouveau les données. Nous nous excusons " -"pour le dérangemente." +"Il est impossible de migrer cet espace de travail au format 0 vers un autre " +"format plus récent. Vous devez supprimer cet espace de travail et récupérer " +"à nouveau les données. Nous nous excusons pour le dérangemente." -#: ../work_migration.cc:208 +#: work_migration.cc:208 #, c-format msgid "workspace is corrupt: %s exists but is not a regular file" msgstr "" -"l'espace de travail est corrompu : %s existe mais n'est pas un fichier " -"normal" +"l'espace de travail est corrompu : %s existe mais n'est pas un fichier normal" -#: ../work_migration.cc:247 +#: work_migration.cc:247 #, c-format msgid "this workspace is in the current format, no migration is necessary." -msgstr "cet espace de travail est dans le format actuel, aucune migration " -"n'est nécessaire" +msgstr "" +"cet espace de travail est dans le format actuel, aucune migration n'est " +"nécessaire" +#~ msgid "failed to parse date string '%s': %s" +#~ msgstr "échou de comprendre la date « %s » : %s" + +#~ msgid "negative depth not allowed\n" +#~ msgstr "profondeur négative interdite\n" + +#~ msgid "illegal argument to --next: cannot be zero or negative\n" +#~ msgstr "argument illégal à --next : il ne pas être nul ou négatif\n" + +#~ msgid "" +#~ "illegal argument to --automate-stdio-size: cannot be zero or negative\n" +#~ msgstr "" +#~ "argument illégal à --automate-stdio-size : il ne doit pas être nul ou " +#~ "négatif\n" + +#~ msgid "[DIRECTORY]\n" +#~ msgstr "[DOSSIER]\n" + +#~ msgid "%s:\n" +#~ msgstr "%s :\n" + +#~ msgid "%s" +#~ msgstr "%s" + +#~ msgid "calculating rosters to regenerate" +#~ msgstr "calcul des listes à régénérer" + +#~ msgid "%s: %s" +#~ msgstr "%s : %s" + #~ msgid "option %s doesn't exist" #~ msgstr "l'option %s n'existe pas" ============================================================ --- po/it.po 34f197c5aebed81c45c64a413582066a15b50717 +++ po/it.po fb9b071491843939ab2e6a762073d23cc5cef3db @@ -1,8 +1,8 @@ msgstr "" msgid "" msgstr "" "Project-Id-Version: monotone\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-23 14:09+0200\n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" "PO-Revision-Date: 2006-10-10 20:10+0100\n" "Last-Translator: Lapo Luchini \n" "Language-Team: Lapo Luchini \n" @@ -14,215 +14,155 @@ msgstr "" "X-Poedit-Country: ITALY\n" "X-Poedit-Basepath: ..\\\n" -#: app_state.cc:151 +#: app_state.cc:129 #, c-format msgid "workspace required but not found%s%s" msgstr "spazio di lavoro richiesto ma non trovato%s%s" -#: app_state.cc:159 +#: app_state.cc:137 #, c-format msgid "invalid directory ''" msgstr "directory non valida ‘’" -#: app_state.cc:167 +#: app_state.cc:145 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "la directory di servizio di monotone ‘%s’ esiste già in ‘%s’" # TODO: radice di ricerca? -#: app_state.cc:245 +#: app_state.cc:201 #, c-format msgid "search root '%s' does not exist" msgstr "la radice di ricerca ‘%s’ non esiste" # TODO: radice di ricerca? -#: app_state.cc:246 +#: app_state.cc:202 #, c-format msgid "search root '%s' is not a directory" msgstr "la radice di ricerca ‘%s’ non è una directory" -#: app_state.cc:280 -#, c-format -msgid "failed to parse date string '%s': %s" -msgstr "impossibile interpretare la stringa ‘%s’ come data: %s" - -#: app_state.cc:295 -#, c-format -msgid "negative depth not allowed" -msgstr "profondità negativa non permessa" - -#: app_state.cc:303 -#, c-format -msgid "illegal argument to --last: cannot be zero or negative" -msgstr "argomento illegale per ‘--last’: non può essere zero o negativo" - -#: app_state.cc:311 -#, c-format -msgid "illegal argument to --next: cannot be zero or negative" -msgstr "argomento illegale per ‘--next’: non può essere zero o negativo" - -#: app_state.cc:388 -#, c-format -msgid "illegal argument to --automate-stdio-size: cannot be zero or negative" -msgstr "argomento illegale per ‘--automate-stdio-size’: non può essere zero o negativo" - -#: automate.cc:65 +#: automate.cc:64 msgid "[BRANCH]" msgstr "[RAMO]" -#: automate.cc:89 -#: automate.cc:136 -#: automate.cc:1207 +#: automate.cc:88 automate.cc:135 automate.cc:1206 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "REV_1 [REV_2 [REV_3 […]]]" -#: automate.cc:99 -#: automate.cc:146 -#: automate.cc:190 -#: automate.cc:331 -#: automate.cc:366 -#: automate.cc:370 -#: automate.cc:429 -#: automate.cc:453 -#: automate.cc:1217 -#: cmd_list.cc:661 +#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330 +#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452 +#: automate.cc:1216 cmd_list.cc:662 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "La revisione %s non esiste" -#: automate.cc:184 -#: automate.cc:325 +#: automate.cc:183 automate.cc:324 msgid "[REV1 [REV2 [REV3 [...]]]]" msgstr "[REV_1 [REV_2 [REV_3 […]]]]" -#: automate.cc:216 +#: automate.cc:215 msgid "FILE" msgstr "FILE" -#: automate.cc:236 +#: automate.cc:235 #, c-format msgid "file %s is unknown to the current workspace" msgstr "il file ‘%s’ non esiste nello spazio di lavoro" -#: automate.cc:357 +#: automate.cc:356 msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "NUOVA_REV [VECCHIA_REV_1 [VECCHIA_REV_2 [...]]]" -#: automate.cc:424 -#: automate.cc:448 -#: cmd_list.cc:651 +#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 msgid "REV" msgstr "REV" -#: automate.cc:525 +#: automate.cc:524 msgid "SELECTOR" msgstr "SELETTORE" -#: automate.cc:894 -#: automate.cc:1024 +#: automate.cc:893 automate.cc:1023 msgid "[REVID]" msgstr "[ID_REV]" -#: automate.cc:923 -#: automate.cc:1046 -#: automate.cc:1530 -#: automate.cc:1589 -#: automate.cc:1594 +#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 +#: automate.cc:1593 #, c-format msgid "no revision %s found in database" msgstr "nel database non è presente la revisione %s" -#: automate.cc:1067 -#: automate.cc:1146 +#: automate.cc:1066 automate.cc:1145 msgid "FILEID" msgstr "ID_FILE" -#: automate.cc:1074 +#: automate.cc:1073 #, c-format msgid "no file version %s found in database" msgstr "nel database non è presente alcun file con versione ‘%s’" -#: automate.cc:1093 -#: automate.cc:1119 -#: cmd_merging.cc:845 +#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845 msgid "REVID" msgstr "ID_REV" -#: automate.cc:1104 -#: automate.cc:1130 -#: automate.cc:1185 -#: automate.cc:1187 -#: cmd_db.cc:35 -#: cmd_diff_log.cc:385 -#: cmd_diff_log.cc:416 -#: cmd_diff_log.cc:418 -#: cmd_files.cc:138 -#: cmd_files.cc:200 -#: cmd_merging.cc:125 -#: cmd_merging.cc:677 -#: cmd_merging.cc:692 -#: cmd_merging.cc:695 -#: cmd_ws_commit.cc:461 -#: commands.cc:388 +#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 +#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "la revisione %s non esiste" -#: automate.cc:1157 +#: automate.cc:1156 #, c-format msgid "no such file '%s'" msgstr "il file ‘%s’ non esiste" -#: automate.cc:1173 +#: automate.cc:1172 msgid "OLD_FILE NEW_FILE" msgstr "VECCHIO_FILE NUOVO_FILE" -#: automate.cc:1318 +#: automate.cc:1317 msgid "[BRANCH_PATTERN]" msgstr "[PATTERN_RAMO]" -#: automate.cc:1414 +#: automate.cc:1413 msgid "KEYID PASSPHRASE" msgstr "ID_CHIAVE PASSPHRASE" -#: automate.cc:1432 -#: cmd_key_cert.cc:41 +#: automate.cc:1431 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "chiave ‘%s’ già esistente" -#: automate.cc:1435 -#: cmd_key_cert.cc:44 +#: automate.cc:1434 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "genero la coppia di chiavi ‘%s’" -#: automate.cc:1437 -#: cmd_key_cert.cc:46 +#: automate.cc:1436 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "immagazzino la coppia di chiavi ‘%s’ in ‘%s/’" -#: automate.cc:1473 +#: automate.cc:1472 msgid "OPTION" msgstr "OPZIONE" -#: automate.cc:1496 +#: automate.cc:1495 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "" -#: automate.cc:1519 +#: automate.cc:1518 msgid "REV FILE" msgstr "REV FILE" -#: automate.cc:1536 -#: automate.cc:1600 +#: automate.cc:1535 automate.cc:1599 #, c-format msgid "file %s is unknown for revision %s" msgstr "il file ‘%s’ è sconosciuto per la revisione %s" -#: automate.cc:1579 +#: automate.cc:1578 msgid "REV1 FILE REV2" msgstr "REV1 FILE REV2" @@ -256,8 +196,7 @@ msgstr "l'hash calcolato sul certificato msgid "calculated cert hash '%s' does not match '%s'" msgstr "l'hash calcolato sul certificato è ‘%s’, non corrisponde a ‘%s’" -#: cert.cc:387 -#: keys.cc:560 +#: cert.cc:387 keys.cc:560 #, c-format msgid "no key pair '%s' found in key store '%s'" msgstr "la coppia di chiavi ‘%s’ non è nel portachiavi ‘%s’" @@ -283,33 +222,45 @@ msgid "no branch found for empty revisio #: cert.cc:485 #, c-format msgid "no branch found for empty revision, please provide a branch name" -msgstr "nessun ramo trovato per revisione vuota, per favore fornisci un nome di ramo" +msgstr "" +"nessun ramo trovato per revisione vuota, per favore fornisci un nome di ramo" #: cert.cc:494 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" -msgstr "nessun certificato di ramo trovato per la revisione %s, per favore inserisci un nome di ramo" +msgstr "" +"nessun certificato di ramo trovato per la revisione %s, per favore inserisci " +"un nome di ramo" #: cert.cc:498 #, c-format -msgid "multiple branch certs found for revision %s, please provide a branch name" -msgstr "trovati certificati con rami multipli per la revisione %s, per favore inserisci il nome di un ramo" +msgid "" +"multiple branch certs found for revision %s, please provide a branch name" +msgstr "" +"trovati certificati con rami multipli per la revisione %s, per favore " +"inserisci il nome di un ramo" -#: cmd_automate.cc:206 +#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 +#: cmd_automate.cc:340 #, c-format +msgid "Bad input to automate stdio" +msgstr "Input non valido per ‘automate stdio’" + +#: cmd_automate.cc:168 +#, c-format msgid "read from client failed with error code: %d" msgstr "lettura dal client fallita con codice di errore: %d" -#: cmd_automate.cc:249 -#, c-format -msgid "Bad input to automate stdio" +#: cmd_automate.cc:169 +#, fuzzy, c-format +msgid "Bad input to automate stdio (unexpected EOF)" msgstr "Input non valido per ‘automate stdio’" -#: cmd_automate.cc:303 +#: cmd_automate.cc:365 msgid "automation" msgstr "automazione" -#: cmd_automate.cc:304 +#: cmd_automate.cc:366 msgid "automation interface" msgstr "interfaccia di automazione" @@ -324,6 +275,7 @@ msgstr "database" # TODO: remove ending newline #: cmd_db.cc:47 +#, fuzzy msgid "" "init\n" "info\n" @@ -338,7 +290,7 @@ msgid "" "check\n" "changesetify\n" "rosterify\n" -"regenerate_rosters\n" +"regenerate_caches\n" "set_epoch BRANCH EPOCH\n" msgstr "" "init\n" @@ -366,8 +318,7 @@ msgstr "L'epoca deve essere di %s caratt msgid "The epoch must be %s characters" msgstr "L'epoca deve essere di %s caratteri" -#: cmd_db.cc:122 -#: cmd_db.cc:138 +#: cmd_db.cc:122 cmd_db.cc:138 msgid "vars" msgstr "variabili" @@ -377,7 +328,8 @@ msgid "set the database variable NAME to #: cmd_db.cc:123 msgid "set the database variable NAME to VALUE, in domain DOMAIN" -msgstr "imposta la variabile NOME del database come VALORE, nel dominio DOMINIO" +msgstr "" +"imposta la variabile NOME del database come VALORE, nel dominio DOMINIO" #: cmd_db.cc:138 msgid "DOMAIN NAME" @@ -392,15 +344,9 @@ msgstr "nessuna variabile ha nome ‘%sâ msgid "no var with name %s in domain %s" msgstr "nessuna variabile ha nome ‘%s’ nel dominio ‘%s’" -#: cmd_db.cc:155 -#: cmd_diff_log.cc:331 -#: cmd_diff_log.cc:541 -#: cmd_files.cc:114 -#: cmd_files.cc:181 -#: cmd_list.cc:457 -#: cmd_merging.cc:614 -#: cmd_ws_commit.cc:355 -#: commands.cc:252 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 +#: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 +#: commands.cc:275 msgid "informative" msgstr "informativo" @@ -417,16 +363,17 @@ msgstr "cifre non decimali nell'ID parzi msgid "non-hex digits in partial id" msgstr "cifre non decimali nell'ID parziale" -#: cmd_diff_log.cc:331 -#: cmd_ws_commit.cc:66 -#: cmd_ws_commit.cc:242 -#: cmd_ws_commit.cc:276 -#: cmd_ws_commit.cc:355 -#: cmd_ws_commit.cc:661 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[PERCORSO…]" -#: cmd_diff_log.cc:332 +#: cmd_diff_log.cc:466 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -439,7 +386,7 @@ msgstr "" "viene stampata la differenza tra loro. Se non è specificato nessun\n" "formato, viene usato per default quello unificato." -#: cmd_diff_log.cc:345 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -448,15 +395,20 @@ msgstr "" "‘--diff-args’ richiede ‘--external’\n" "prova ad aggiungere ‘--external’ o togliere ‘--diff-args’" -#: cmd_diff_log.cc:477 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "nessun cambiamento" -#: cmd_diff_log.cc:541 +#: cmd_diff_log.cc:520 +#, fuzzy +msgid "[FILE [...]]" +msgstr "[FILE…]" + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[FILE…]" -#: cmd_diff_log.cc:542 +#: cmd_diff_log.cc:604 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -464,17 +416,13 @@ msgstr "" "stampa lo storico in ordine contrario (filtrando per ‘FILE’).\n" "Se sono specificate una o più revisioni, le come punto di partenza." -#: cmd_diff_log.cc:604 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "solo un comando permesso tra ‘--last’ e ‘--next’" -#: cmd_files.cc:28 -#: cmd_files.cc:41 -#: cmd_files.cc:78 -#: cmd_files.cc:157 -#: cmd_merging.cc:845 -#: cmd_othervcs.cc:15 +#: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157 +#: cmd_merging.cc:845 cmd_othervcs.cc:15 msgid "debug" msgstr "debug" @@ -567,48 +515,42 @@ msgstr "copia un file dal database a std msgid "write file from database to stdout" msgstr "copia un file dal database a stdout" -#: cmd_files.cc:212 -#: cmd_files.cc:214 +#: cmd_files.cc:212 cmd_files.cc:214 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "nessun file ‘%s’ trovato nella revisione %s" -#: cmd.hh:108 +#: cmd.hh:89 #, c-format msgid "non-hex digits in id" msgstr "id con cifre non esadecimali" -#: cmd.hh:117 +#: cmd.hh:98 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "l'id parziale ‘%s’ non può essere espanso" -#: cmd.hh:121 +#: cmd.hh:102 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:" msgstr "id parziale ‘%s’ ha espansioni multiple ambigue:" -#: cmd.hh:129 +#: cmd.hh:110 #, c-format msgid "expanded partial id '%s' to '%s'" msgstr "id parziale ‘%s’ espanso in ‘%s’" -#: cmd.hh:212 +#: cmd.hh:195 #, c-format msgid "Alias for %s" msgstr "Alias per %s" -#: cmd_key_cert.cc:26 -#: cmd_key_cert.cc:51 -#: cmd_key_cert.cc:90 -#: cmd_key_cert.cc:111 -#: cmd_key_cert.cc:147 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 +#: cmd_key_cert.cc:113 cmd_key_cert.cc:149 msgid "key and cert" msgstr "chiavi e cert" -#: cmd_key_cert.cc:26 -#: cmd_key_cert.cc:51 -#: cmd_key_cert.cc:90 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 msgid "KEYID" msgstr "IDCHIAVE" @@ -616,57 +558,63 @@ msgstr "genera una coppia di chiavi RSA" msgid "generate an RSA key-pair" msgstr "genera una coppia di chiavi RSA" -#: cmd_key_cert.cc:51 +#: cmd_key_cert.cc:53 msgid "drop a public and private key" msgstr "cancella una coppia di chiavi" -#: cmd_key_cert.cc:65 +#: cmd_key_cert.cc:67 #, c-format msgid "dropping public key '%s' from database" msgstr "sto cancellando la chiave pubblica ‘%s’ dal database" -#: cmd_key_cert.cc:75 +#: cmd_key_cert.cc:77 #, c-format msgid "dropping key pair '%s' from keystore" msgstr "cancello la coppia di chiavi ‘%s’ dal portachiavi" -#: cmd_key_cert.cc:82 +#: cmd_key_cert.cc:84 #, c-format msgid "public or private key '%s' does not exist in keystore or database" -msgstr "o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi o nel database" +msgstr "" +"o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi o nel " +"database" -#: cmd_key_cert.cc:85 +#: cmd_key_cert.cc:87 #, c-format -msgid "public or private key '%s' does not exist in keystore, and no database was specified" -msgstr "o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi, e nessun database è stato specificato" +msgid "" +"public or private key '%s' does not exist in keystore, and no database was " +"specified" +msgstr "" +"o la chiave pubblica o quella privata ‘%s’ non esiste nel portachiavi, e " +"nessun database è stato specificato" -#: cmd_key_cert.cc:91 +#: cmd_key_cert.cc:93 msgid "change passphrase of a private RSA key" msgstr "cambia la passphrase di una chiave privata RSA" -#: cmd_key_cert.cc:101 +#: cmd_key_cert.cc:103 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "la chiave ‘%s’ non è nel portachiavi" -#: cmd_key_cert.cc:108 +#: cmd_key_cert.cc:110 #, c-format msgid "passphrase changed" msgstr "passphrase cambiata" -#: cmd_key_cert.cc:111 +#: cmd_key_cert.cc:113 msgid "REVISION CERTNAME [CERTVAL]" msgstr "REVISIONE NOME_CERT VALORE_CERT" -#: cmd_key_cert.cc:112 +#: cmd_key_cert.cc:114 msgid "create a cert for a revision" msgstr "crea un certificato per una revisione" -#: cmd_key_cert.cc:148 +#: cmd_key_cert.cc:150 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "REVISIONE NOME VALORE FIRMATARIO1 [FIRMATARIO2 […]]" -#: cmd_key_cert.cc:149 +#: cmd_key_cert.cc:151 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -674,7 +622,7 @@ msgstr "" "verifica se un ipotetico certificato sarebbe fidato\n" "secondo la configurazione attuale" -#: cmd_key_cert.cc:182 +#: cmd_key_cert.cc:184 #, c-format msgid "" "if a cert on: %s\n" @@ -689,73 +637,68 @@ msgstr "" "fosse stato firmato da: %s\n" "sarebbe: %s" -#: cmd_key_cert.cc:191 +#: cmd_key_cert.cc:193 msgid "trusted" msgstr "fidato" -#: cmd_key_cert.cc:191 +#: cmd_key_cert.cc:193 msgid "UNtrusted" msgstr "NON fidato" -#: cmd_key_cert.cc:195 -#: cmd_key_cert.cc:208 -#: cmd_key_cert.cc:221 -#: cmd_key_cert.cc:237 -#: cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:189 msgid "review" msgstr "verifica" -#: cmd_key_cert.cc:195 +#: cmd_key_cert.cc:197 msgid "REVISION TAGNAME" msgstr "REVISIONE NOME_ETICHETTA" -#: cmd_key_cert.cc:196 +#: cmd_key_cert.cc:198 msgid "put a symbolic tag cert on a revision" msgstr "poni un tag simbolico su una revisione" # questa frase non credo vada tradotta -#: cmd_key_cert.cc:208 +#: cmd_key_cert.cc:210 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: cmd_key_cert.cc:209 +#: cmd_key_cert.cc:211 msgid "note the results of running a test on a revision" msgstr "annota i risultati dell'esecuzione di un test su una revisione" -#: cmd_key_cert.cc:221 -#: cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:189 msgid "REVISION" msgstr "REVISIONE" -#: cmd_key_cert.cc:222 +#: cmd_key_cert.cc:224 msgid "approve of a particular revision" msgstr "approva una particolare revisione" -#: cmd_key_cert.cc:233 +#: cmd_key_cert.cc:235 #, c-format msgid "need --branch argument for approval" msgstr "per ‘approve’ è necessario un argomento ‘--branch=RAMO’" -#: cmd_key_cert.cc:237 +#: cmd_key_cert.cc:239 msgid "REVISION [COMMENT]" msgstr "REVISIONE [COMMENTO]" -#: cmd_key_cert.cc:238 +#: cmd_key_cert.cc:240 msgid "comment on a particular revision" msgstr "commento su una specifica revisione" -#: cmd_key_cert.cc:250 +#: cmd_key_cert.cc:252 #, c-format msgid "edit comment failed" msgstr "modifica del commento fallita" -#: cmd_key_cert.cc:255 +#: cmd_key_cert.cc:257 #, c-format msgid "empty comment" msgstr "commento vuoto" -#: cmd_list.cc:64 -#: cmd_list.cc:675 +#: cmd_list.cc:64 cmd_list.cc:676 #, c-format msgid "no public key '%s' found in database" msgstr "la chiave pubblica ‘%s’ non è nel database" @@ -806,7 +749,7 @@ msgstr "nessuna epoca trovata per il ram msgid "no epoch for branch %s" msgstr "nessuna epoca trovata per il ramo ‘%s’" -#: cmd_list.cc:458 +#: cmd_list.cc:459 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -832,7 +775,7 @@ msgstr "" "missing\n" "changed" -#: cmd_list.cc:469 +#: cmd_list.cc:470 msgid "" "show database objects, or the current workspace manifest, \n" "or known, unknown, intentionally ignored, missing, or \n" @@ -842,15 +785,9 @@ msgstr "" "attuale, o i file conosciuti, sconosciuti, intenzionalmente ignorati,\n" "mancanti o modificati" -#: cmd_merging.cc:73 -#: cmd_merging.cc:655 -#: cmd_ws_commit.cc:66 -#: cmd_ws_commit.cc:242 -#: cmd_ws_commit.cc:276 -#: cmd_ws_commit.cc:311 -#: cmd_ws_commit.cc:336 -#: cmd_ws_commit.cc:561 -#: cmd_ws_commit.cc:661 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66 +#: cmd_ws_commit.cc:252 cmd_ws_commit.cc:293 cmd_ws_commit.cc:329 +#: cmd_ws_commit.cc:354 cmd_ws_commit.cc:579 cmd_ws_commit.cc:679 msgid "workspace" msgstr "spazio di lavoro" @@ -864,14 +801,17 @@ msgstr "" msgstr "" "aggiorna spazio di lavoro.\n" "Questo comando modifica il tuo spazio di lavoro affinché sia basato su di\n" -"una differente versione, preservando nel contempo i cambiamenti non sottomessi.\n" -"Se è specificata una revisione, aggiorna lo spazio di lavoro a quella revisione.\n" +"una differente versione, preservando nel contempo i cambiamenti non " +"sottomessi.\n" +"Se è specificata una revisione, aggiorna lo spazio di lavoro a quella " +"revisione.\n" "Altrimenti aggiorna lo spazio di lavoro alla testa del ramo." #: cmd_merging.cc:95 #, c-format msgid "this workspace is a new project; cannot update" -msgstr "questo spazio di lavoro è un nuovo progetto, non posso fare un ‘update’" +msgstr "" +"questo spazio di lavoro è un nuovo progetto, non posso fare un ‘update’" #: cmd_merging.cc:102 #, c-format @@ -962,21 +902,14 @@ msgstr "[destra] %s" msgid "[right] %s" msgstr "[destra] %s" -#: cmd_merging.cc:313 -#: cmd_merging.cc:584 +#: cmd_merging.cc:313 cmd_merging.cc:584 #, c-format msgid "[merged] %s" msgstr "[unione] %s" -#: cmd_merging.cc:320 -#: cmd_merging.cc:419 -#: cmd_merging.cc:430 -#: cmd_merging.cc:588 -#: cmd_merging.cc:821 -#: cmd_ws_commit.cc:421 -#: cmd_ws_commit.cc:907 -#: cmd_ws_commit.cc:930 -#: cmd_ws_commit.cc:944 +#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588 +#: cmd_merging.cc:821 cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 msgid "tree" msgstr "albero" @@ -984,17 +917,13 @@ msgstr "fa il ‘merge’ delle teste di msgid "merge unmerged heads of branch" msgstr "fa il ‘merge’ delle teste di un ramo" -#: cmd_merging.cc:330 -#: cmd_merging.cc:829 +#: cmd_merging.cc:330 cmd_merging.cc:829 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "specifica un ramo, con ‘--branch=RAMO’" -#: cmd_merging.cc:335 -#: cmd_merging.cc:469 -#: cmd_merging.cc:472 -#: cmd_merging.cc:834 -#: cmd_ws_commit.cc:445 +#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 +#: cmd_ws_commit.cc:463 #, c-format msgid "branch '%s' is empty" msgstr "il ramo ‘%s’ è vuoto" @@ -1011,8 +940,7 @@ msgstr[1] "%d teste sul ramo ‘%s’" msgstr[0] "%d testa sul ramo ‘%s’" msgstr[1] "%d teste sul ramo ‘%s’" -#: cmd_merging.cc:363 -#: cmd_merging.cc:408 +#: cmd_merging.cc:363 cmd_merging.cc:408 #, c-format msgid "merge %d / %d:" msgstr "merge %d / %d:" @@ -1043,8 +971,7 @@ msgstr "‘merge’ di un ramo in una so msgid "merge one branch into a subdirectory in another branch" msgstr "‘merge’ di un ramo in una sottodirectory di un altro ramo" -#: cmd_merging.cc:470 -#: cmd_merging.cc:473 +#: cmd_merging.cc:470 cmd_merging.cc:473 #, c-format msgid "branch '%s' is not merged" msgstr "il ramo ‘%s’ è separato" @@ -1090,15 +1017,16 @@ msgid "merge two explicitly given revisi #: cmd_merging.cc:590 msgid "merge two explicitly given revisions, placing result in given branch" -msgstr "unisce due revisioni specificate, mettendo il risultato in un ramo specificato" +msgstr "" +"unisce due revisioni specificate, mettendo il risultato in un ramo " +"specificato" #: cmd_merging.cc:605 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s e %s sono la stessa revisione, annullo" -#: cmd_merging.cc:607 -#: cmd_merging.cc:609 +#: cmd_merging.cc:607 cmd_merging.cc:609 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s è già antenato di %s" @@ -1108,11 +1036,13 @@ msgstr "REV REV" msgstr "REV REV" #: cmd_merging.cc:615 -msgid "Show what conflicts would need to be resolved to merge the given revisions." -msgstr "Mostra quali conflitti andrebbero risolto per fare il ‘merge’ di due revisioni specificate." +msgid "" +"Show what conflicts would need to be resolved to merge the given revisions." +msgstr "" +"Mostra quali conflitti andrebbero risolto per fare il ‘merge’ di due " +"revisioni specificate." -#: cmd_merging.cc:625 -#: cmd_merging.cc:627 +#: cmd_merging.cc:625 cmd_merging.cc:627 #, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "‘%s’ è un antenato di ‘%s’: il merge non è necessario." @@ -1216,99 +1146,104 @@ msgstr "stampa il roster associato al RE msgid "dump the roster associated with the given REVID" msgstr "stampa il roster associato al REVID dato" -#: cmd_netsync.cc:42 +#: cmd_netsync.cc:43 #, c-format msgid "setting default server to %s" msgstr "imposto il server di default a ‘%s’" -#: cmd_netsync.cc:48 +#: cmd_netsync.cc:49 #, c-format msgid "no hostname given" msgstr "nessun nome di host specificato" -#: cmd_netsync.cc:50 +#: cmd_netsync.cc:51 #, c-format msgid "no server given and no default server set" msgstr "nessun server specificato e nessun server di default impostato" -#: cmd_netsync.cc:78 -#: cmd_netsync.cc:98 +#: cmd_netsync.cc:79 cmd_netsync.cc:101 #, c-format msgid "no branch pattern given" msgstr "nessun pattern di ramo specificato" -#: cmd_netsync.cc:86 +#: cmd_netsync.cc:88 #, c-format msgid "setting default branch include pattern to '%s'" msgstr "imposto il pattern di default di inclusione rami a ‘%s’" -#: cmd_netsync.cc:92 +#: cmd_netsync.cc:95 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "imposto il pattern di default di esclusione rami a ‘%s’" -#: cmd_netsync.cc:100 +#: cmd_netsync.cc:103 #, c-format msgid "no branch pattern given and no default pattern set" -msgstr "nessun pattern di ramo specificato e nessun pattern di default impostato" +msgstr "" +"nessun pattern di ramo specificato e nessun pattern di default impostato" -#: cmd_netsync.cc:116 -#: cmd_netsync.cc:129 -#: cmd_netsync.cc:144 -#: cmd_netsync.cc:188 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 msgid "network" msgstr "rete" -#: cmd_netsync.cc:116 -#: cmd_netsync.cc:129 -#: cmd_netsync.cc:144 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[INDIRIZZO[:NUMERO_PORTA] [PATTERN]]" -#: cmd_netsync.cc:117 +#: cmd_netsync.cc:120 msgid "push branches matching PATTERN to netsync server at ADDRESS" -msgstr "invia i rami che corrispondono a PATTERN al server netsync presso INDIRIZZO" +msgstr "" +"invia i rami che corrispondono a PATTERN al server netsync presso INDIRIZZO" -#: cmd_netsync.cc:130 +#: cmd_netsync.cc:133 msgid "pull branches matching PATTERN from netsync server at ADDRESS" -msgstr "riceve i rami che corrispondono a PATTERN dal server netsync presso INDIRIZZO" +msgstr "" +"riceve i rami che corrispondono a PATTERN dal server netsync presso INDIRIZZO" -#: cmd_netsync.cc:138 +#: cmd_netsync.cc:141 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" -msgstr "eseguo ‘pull’ anonimo; utilizza ‘-k NOMECHIAVE’ se necessiti di autenticazione" +msgstr "" +"eseguo ‘pull’ anonimo; utilizza ‘-k NOMECHIAVE’ se necessiti di " +"autenticazione" -#: cmd_netsync.cc:145 +#: cmd_netsync.cc:148 msgid "sync branches matching PATTERN with netsync server at ADDRESS" -msgstr "sync dei rami che corrispondono a PATTERN con server netsync presso INDIRIZZO" +msgstr "" +"sync dei rami che corrispondono a PATTERN con server netsync presso INDIRIZZO" -#: cmd_netsync.cc:164 +#: cmd_netsync.cc:167 #, c-format msgid "pid file '%s' already exists" msgstr "il file pid ‘%s’ esiste già" -#: cmd_netsync.cc:166 +#: cmd_netsync.cc:169 #, c-format msgid "failed to create pid file '%s'" msgstr "creazione del file PID ‘%s’ fallita" -#: cmd_netsync.cc:188 +#: cmd_netsync.cc:191 msgid "PATTERN ..." msgstr "PATTERN …" -#: cmd_netsync.cc:189 +#: cmd_netsync.cc:192 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "" -#: cmd_netsync.cc:205 +#: cmd_netsync.cc:208 #, c-format -msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())" -msgstr "è necessario un permesso per ricordare la passphrase (vedi hook ‘persist_phrase_ok()’)" +msgid "" +"need permission to store persistent passphrase (see hook persist_phrase_ok())" +msgstr "" +"è necessario un permesso per ricordare la passphrase (vedi hook " +"‘persist_phrase_ok()’)" -#: cmd_netsync.cc:211 +#: cmd_netsync.cc:214 #, c-format -msgid "The --no-transport-auth option is only permitted in combination with --stdio" -msgstr "L'opzione ‘--no-transport-auth’ è permessa solo in combinazione con ‘--stdio’" +msgid "" +"The --no-transport-auth option is only permitted in combination with --stdio" +msgstr "" +"L'opzione ‘--no-transport-auth’ è permessa solo in combinazione con ‘--stdio’" #: cmd_othervcs.cc:15 msgid "RCSFILE..." @@ -1317,7 +1252,8 @@ msgid "" #: cmd_othervcs.cc:16 msgid "" "parse versions in RCS files\n" -"this command doesn't reconstruct or import revisions.you probably want cvs_import" +"this command doesn't reconstruct or import revisions.you probably want " +"cvs_import" msgstr "" #: cmd_othervcs.cc:32 @@ -1332,14 +1268,11 @@ msgstr "importa tutte le versioni di un msgid "import all versions in CVS repository" msgstr "importa tutte le versioni di un repository CVS" -#: cmd_packet.cc:21 -#: cmd_packet.cc:50 -#: cmd_packet.cc:69 +#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69 msgid "packet i/o" msgstr "i/o pacchetti" -#: cmd_packet.cc:21 -#: cmd_packet.cc:50 +#: cmd_packet.cc:21 cmd_packet.cc:50 msgid "ID" msgstr "ID" @@ -1431,25 +1364,35 @@ msgstr "disapprova una particolare revis msgstr "disapprova una particolare revisione" # TODO: invert? -#: cmd_ws_commit.cc:203 +#: cmd_ws_commit.cc:206 #, c-format msgid "revision %s has %d changesets, cannot invert" msgstr "la revisione %s contiene %d changeset, non può essere annullata" -#: cmd_ws_commit.cc:207 +#: cmd_ws_commit.cc:210 #, c-format msgid "need --branch argument for disapproval" msgstr "per ‘disapprove’ è necessario un argomento ‘--branch=RAMO’" -#: cmd_ws_commit.cc:243 +#: cmd_ws_commit.cc:253 msgid "add files to workspace" msgstr "aggiunge file allo spazio di lavoro" -#: cmd_ws_commit.cc:277 +#: cmd_ws_commit.cc:260 +#, c-format +msgid "cannot set '--unknown' and '--recursive' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:262 +#, c-format +msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:294 msgid "drop files from workspace" msgstr "toglie file dallo spazio di lavoro" -#: cmd_ws_commit.cc:312 +#: cmd_ws_commit.cc:330 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1457,15 +1400,15 @@ msgstr "" "SORG DEST\n" "SORG1 [SORG2 […]] CART_DEST" -#: cmd_ws_commit.cc:314 +#: cmd_ws_commit.cc:332 msgid "rename entries in the workspace" msgstr "rinomina elementi dello spazio di lavoro" -#: cmd_ws_commit.cc:336 +#: cmd_ws_commit.cc:354 msgid "NEW_ROOT PUT_OLD" msgstr "NUOVA_ROOT METTI_VECCHIA" -#: cmd_ws_commit.cc:337 +#: cmd_ws_commit.cc:355 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1479,31 +1422,31 @@ msgstr "" "avrà il nome PUT_OLD.\n" "È fortemente consigliato l'uso di ‘--execute’." -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:373 msgid "show status of workspace" msgstr "mostra stato dello spazio di lavoro" -#: cmd_ws_commit.cc:384 +#: cmd_ws_commit.cc:402 #, c-format msgid "Current branch: %s" msgstr "Ramo attuale: %s" -#: cmd_ws_commit.cc:390 +#: cmd_ws_commit.cc:408 #, c-format msgid "Changes against parent %s" msgstr "Modifiche rispetto al genitore %s" -#: cmd_ws_commit.cc:395 +#: cmd_ws_commit.cc:413 #, c-format msgid " no changes" msgstr " nessun cambiamento" -#: cmd_ws_commit.cc:399 +#: cmd_ws_commit.cc:417 #, c-format msgid " dropped %s" msgstr " eliminato %s" -#: cmd_ws_commit.cc:404 +#: cmd_ws_commit.cc:422 #, c-format msgid "" " renamed %s\n" @@ -1512,24 +1455,21 @@ msgstr "" " rinominato %s\n" " in %s" -#: cmd_ws_commit.cc:409 -#: cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 #, c-format msgid " added %s" msgstr " aggiunto %s" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:435 #, c-format msgid " patched %s" msgstr " modificato %s" -#: cmd_ws_commit.cc:421 -#: cmd_ws_commit.cc:907 -#: cmd_ws_commit.cc:930 +#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 msgid "[DIRECTORY]" msgstr "[DIRECTORY]" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:440 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" @@ -1539,50 +1479,54 @@ msgstr "" "estrae una revisione dal database in una directory.\n" "Se viene specificata una revisione, sarà quella ad essere estratta.\n" "Altrimenti sarà la testa del ramo (specificato o implicito).\n" -"Se nessuna directory è specificata, il nome del ramo sarà usato come directory" +"Se nessuna directory è specificata, il nome del ramo sarà usato come " +"directory" # TODO: ‘estrarre’ non mi convince? -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:458 #, c-format msgid "use --revision or --branch to specify what to checkout" -msgstr "utilizza ‘--revision’ o ‘--branch’ per specificare cosa estrarre con il checkout" +msgstr "" +"utilizza ‘--revision’ o ‘--branch’ per specificare cosa estrarre con il " +"checkout" -#: cmd_ws_commit.cc:448 +#: cmd_ws_commit.cc:466 #, c-format msgid "branch %s has multiple heads:" msgstr "il ramo ‘%s’ ha più teste:" -#: cmd_ws_commit.cc:451 +#: cmd_ws_commit.cc:469 #, c-format msgid "choose one with '%s checkout -r'" msgstr "scegline una con ‘%s checkout -r’" -#: cmd_ws_commit.cc:452 +#: cmd_ws_commit.cc:470 #, c-format msgid "branch %s has multiple heads" msgstr "il ramo ‘%s’ ha più teste" -#: cmd_ws_commit.cc:479 +#: cmd_ws_commit.cc:497 #, c-format msgid "revision %s is not a member of branch %s" msgstr "la revisione %s non fa parte del ramo ‘%s’" -#: cmd_ws_commit.cc:496 +#: cmd_ws_commit.cc:514 #, c-format msgid "you must specify a destination directory" msgstr "devi specificare una directory di destinazione" -#: cmd_ws_commit.cc:509 +#: cmd_ws_commit.cc:527 #, c-format msgid "checkout directory '%s' already exists" -msgstr "la directory ‘%s’ esiste già, non può essere utilizzata per il ‘checkout’" +msgstr "" +"la directory ‘%s’ esiste già, non può essere utilizzata per il ‘checkout’" -#: cmd_ws_commit.cc:543 +#: cmd_ws_commit.cc:561 #, c-format msgid "no file %s found in database for %s" msgstr "nessun file ‘%s’ trovato per ‘%s’ in database" -#: cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:579 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1592,87 +1536,87 @@ msgstr "" "get PERCORSO [ATTR]\n" "drop PERCORSO [ATTR]" -#: cmd_ws_commit.cc:562 +#: cmd_ws_commit.cc:580 msgid "set, get or drop file attributes" msgstr "imposta, legge o elimina attributi sui file" -#: cmd_ws_commit.cc:579 +#: cmd_ws_commit.cc:597 #, c-format msgid "Unknown path '%s'" msgstr "Percorso sconosciuto ‘%s’" -#: cmd_ws_commit.cc:608 +#: cmd_ws_commit.cc:626 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Il percorso ‘%s’ non ha l'attributo ‘%s’" -#: cmd_ws_commit.cc:638 +#: cmd_ws_commit.cc:656 #, c-format msgid "No attributes for '%s'" msgstr "Nessun attributo per ‘%s’" -#: cmd_ws_commit.cc:649 +#: cmd_ws_commit.cc:667 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Nessun attributo ‘%s’ nel percorso ‘%s’" -#: cmd_ws_commit.cc:662 +#: cmd_ws_commit.cc:680 msgid "commit workspace to database" msgstr "salvataggio dello spazio di lavoro nel database" -#: cmd_ws_commit.cc:693 +#: cmd_ws_commit.cc:711 #, c-format msgid "no changes to commit" msgstr "nessuna modifica da salvare" -#: cmd_ws_commit.cc:713 +#: cmd_ws_commit.cc:731 #, c-format msgid "beginning commit on branch '%s'" msgstr "inizio il commit sul ramo ‘%s’" -#: cmd_ws_commit.cc:722 +#: cmd_ws_commit.cc:740 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" "perhaps move or delete _MTN/log,\n" "or remove --message/--message-file from the command line?" msgstr "" -"‘_MTN/log’ non è vuoto e un messaggio di log è stato specificato sulla riga di comando\n" +"‘_MTN/log’ non è vuoto e un messaggio di log è stato specificato sulla riga " +"di comando\n" "forse vuoi muovere o cancellare ‘_MTN/log’ oppure\n" "togliere ‘--message’/‘--message-file’ dalla riga di comando?" -#: cmd_ws_commit.cc:737 +#: cmd_ws_commit.cc:755 #, c-format msgid "empty log message; commit canceled" msgstr "messaggio di log vuoto; salvataggio annullato" -#: cmd_ws_commit.cc:759 +#: cmd_ws_commit.cc:777 #, c-format msgid "log message rejected by hook: %s" msgstr "messaggio di log respinto dall'hook: %s" -#: cmd_ws_commit.cc:767 +#: cmd_ws_commit.cc:785 #, c-format msgid "revision %s already in database" msgstr "la revisione %s è già nel database" -#: cmd_ws_commit.cc:806 -#: cmd_ws_commit.cc:836 +#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "file ‘%s’ modificato durante il commit, abbandono" -#: cmd_ws_commit.cc:818 +#: cmd_ws_commit.cc:836 #, c-format msgid "Your database is missing version %s of file '%s'" msgstr "Nel tuo database manca la versione %s del file ‘%s’" -#: cmd_ws_commit.cc:868 +#: cmd_ws_commit.cc:886 #, c-format msgid "committed revision %s" msgstr "salvato come revisione %s" -#: cmd_ws_commit.cc:874 +#: cmd_ws_commit.cc:892 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1681,71 +1625,74 @@ msgstr "" "nota: questa revisione crea una divergenza\n" "nota: potresti voler (o non voler) eseguire ‘%s merge’" -#: cmd_ws_commit.cc:908 +#: cmd_ws_commit.cc:926 msgid "setup a new workspace directory, default to current" -msgstr "imposta una nuova directory come spazio di lavoro, il default è quella attuale" +msgstr "" +"imposta una nuova directory come spazio di lavoro, il default è quella " +"attuale" -#: cmd_ws_commit.cc:914 +#: cmd_ws_commit.cc:932 #, c-format msgid "need --branch argument for setup" msgstr "per il ‘setup’ è necessario un argomento ‘--branch=RAMO’" -#: cmd_ws_commit.cc:931 -msgid "migrate a workspace directory's metadata to the latest format; defaults to the current workspace" +#: cmd_ws_commit.cc:949 +msgid "" +"migrate a workspace directory's metadata to the latest format; defaults to " +"the current workspace" msgstr "" -#: cmd_ws_commit.cc:944 +#: cmd_ws_commit.cc:962 msgid "refresh the inodeprint cache" msgstr "aggiorna la cache degli inodeprint" -#: commands.cc:131 -#: commands.cc:233 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "comando ‘%s’ sconosciuto" -#: commands.cc:142 +#: commands.cc:150 #, c-format msgid "command '%s' has multiple ambiguous expansions:" msgstr "il comando ‘%s’ ha espansioni multiple ambigue:" -#: commands.cc:175 +#: commands.cc:183 msgid "commands:" msgstr "comandi:" -#: commands.cc:252 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "comando [ARGOMENTI…]" -#: commands.cc:252 +#: commands.cc:276 msgid "display command help" msgstr "mostra l'aiuto sui comandi" -#: commands.cc:395 +#: commands.cc:420 #, c-format msgid "expanding selection '%s'" msgstr "espando la selezione ‘%s’" -#: commands.cc:403 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "nessuna corrispondenza per la selezione ‘%s’" -#: commands.cc:409 +#: commands.cc:434 #, c-format msgid "expanded to '%s'" msgstr "espanso in ‘%s’" -#: commands.cc:426 +#: commands.cc:451 #, c-format msgid "selection '%s' has multiple ambiguous expansions:" msgstr "la selezione ‘%s’ ha espansioni multiple ambigue:" -#: commands.cc:443 +#: commands.cc:468 msgid "note: " msgstr "nota: " -#: commands.cc:444 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1754,266 +1701,318 @@ msgstr "" "il ramo ‘%s’ ha più teste\n" "valuta l'uso di ‘%s merge’" -#: commands.cc:458 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "‘--message’ e ‘--message-file’ sono mutuamente esclusivi" -#: database_check.cc:129 +#: database_check.cc:137 #, c-format msgid "file structure is corrupted; cannot check further" msgstr "la struttura del file è rovinata; non puoi più controllare" -#: database_check.cc:140 +#: database_check.cc:148 msgid "files" msgstr "file" -#: database_check.cc:169 +#: database_check.cc:177 msgid "rosters" msgstr "roster" -#: database_check.cc:227 +#: database_check.cc:235 msgid "markings" msgstr "contrassegni" -#: database_check.cc:298 -#: netsync.cc:2967 -#: rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 msgid "revisions" msgstr "revisioni" -#: database_check.cc:393 +#: database_check.cc:401 msgid "ancestry" msgstr "ascendenza" -#: database_check.cc:426 -#: netsync.cc:2971 +#: database_check.cc:434 netsync.cc:2973 msgid "keys" msgstr "chiavi" -#: database_check.cc:452 +#: database_check.cc:460 msgid "certs" msgstr "certificati" -#: database_check.cc:489 +#: database_check.cc:504 +msgid "heights" +msgstr "" + +#: database_check.cc:548 +msgid "height relations" +msgstr "" + +#: database_check.cc:594 #, c-format msgid "file %s missing (%d manifest references)" msgstr "file ‘%s’ mancante (%d riferimenti al manifesto)" -#: database_check.cc:496 +#: database_check.cc:601 #, c-format msgid "file %s unreferenced" msgstr "file ‘%s’ senza referenze" -#: database_check.cc:515 +#: database_check.cc:620 #, c-format msgid "roster %s unreferenced" msgstr "roster ‘%s’ senza referenze" -#: database_check.cc:521 +#: database_check.cc:626 #, c-format msgid "roster %s incomplete (%d missing files)" msgstr "roster ‘%s’ incompleto (%d file mancanti)" -#: database_check.cc:528 +#: database_check.cc:633 #, c-format msgid "roster %s incomplete (%d missing revisions)" msgstr "roster ‘%s’ incompleto (%d revisioni mancanti)" -#: database_check.cc:553 +#: database_check.cc:658 #, c-format -msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)" -msgstr "revisione %s mancante (%d riferimenti alla revisione; %d riferimenti al certificato; %d riferimenti al genitore; %d riferimenti al figlio; %d riferimenti al roster)" +msgid "" +"revision %s missing (%d revision references; %d cert references; %d parent " +"references; %d child references; %d roster references)" +msgstr "" +"revisione %s mancante (%d riferimenti alla revisione; %d riferimenti al " +"certificato; %d riferimenti al genitore; %d riferimenti al figlio; %d " +"riferimenti al roster)" -#: database_check.cc:561 +#: database_check.cc:666 #, c-format msgid "revision %s incomplete (%d missing manifests)" msgstr "la revisione %s è incompleta (mancano %d manifesti)" -#: database_check.cc:568 +#: database_check.cc:673 #, c-format msgid "revision %s incomplete (%d missing revisions)" msgstr "la revisione %s è incompleta (mancano %d revisioni)" -#: database_check.cc:575 +#: database_check.cc:680 #, c-format msgid "revision %s incomplete (missing roster)" msgstr "la revisione %s è incompleta (manca il roster)" -#: database_check.cc:581 +#: database_check.cc:686 #, c-format msgid "revision %s mismatched roster and manifest" msgstr "la revisione %s non corrisponde al roster né al manifesto" -#: database_check.cc:587 +#: database_check.cc:692 #, c-format msgid "revision %s incomplete (incomplete roster)" msgstr "la revisione %s è incompleta (roster incompleto)" # TODO: stirpi? -#: database_check.cc:593 +#: database_check.cc:698 #, c-format msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)" -msgstr "la revisione %s non corrisponde ai genitori (%d stirpi di genitori; %d riferimenti alla revisione)" +msgstr "" +"la revisione %s non corrisponde ai genitori (%d stirpi di genitori; %d " +"riferimenti alla revisione)" # TODO: stirpi? -#: database_check.cc:602 +#: database_check.cc:707 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)" -msgstr "la revisione %s non corrisponde ai figli (%d stirpi di figli; %d genitori)" +msgstr "" +"la revisione %s non corrisponde ai figli (%d stirpi di figli; %d genitori)" -#: database_check.cc:614 +#: database_check.cc:719 #, c-format msgid "revision %s has bad history (%s)" msgstr "la revisione %s ha una storia non valida (%s)" # TODO: togliere il ? in inglese -#: database_check.cc:621 +#: database_check.cc:726 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)" -msgstr "revisione %s non comprensibile (forse a causa di percorsi non normalizzati)" +msgstr "" +"revisione %s non comprensibile (forse a causa di percorsi non normalizzati)" -#: database_check.cc:628 +#: database_check.cc:733 #, c-format msgid "revision %s is not in normalized form" msgstr "la revisione %s non in forma normalizzata" -#: database_check.cc:652 +#: database_check.cc:757 #, c-format msgid "key %s missing (signed %d certs)" msgstr "chiave %s mancante (firma %d certificati)" -#: database_check.cc:685 +#: database_check.cc:790 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s" -msgstr "revisione %s firma non controllata nel certificato ‘%s’ per chiave ‘%s’ mancante" +msgstr "" +"revisione %s firma non controllata nel certificato ‘%s’ per chiave ‘%s’ " +"mancante" -#: database_check.cc:693 +#: database_check.cc:798 #, c-format msgid "revision %s bad signature in %s cert from key %s" msgstr "revisione %s firma non ammessa per certificato ‘%s’ della chiave ‘%s’" -#: database_check.cc:708 +#: database_check.cc:813 #, c-format msgid "revision %s missing %s cert" msgstr "alla revisione %s manca il certificato ‘%s’" -#: database_check.cc:717 +#: database_check.cc:822 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)" -msgstr "la revisione %s non corrisponde ai certificati (%d autori %d date %d changelogs)" +msgstr "" +"la revisione %s non corrisponde ai certificati (%d autori %d date %d " +"changelogs)" -#: database_check.cc:797 +#: database_check.cc:846 +#, fuzzy, c-format +msgid "height missing for revision %s" +msgstr "%d revisioni mancanti" + +#: database_check.cc:853 +#, fuzzy, c-format +msgid "duplicate height for revision %s" +msgstr "aggiornato alla revisione base %s" + +#: database_check.cc:859 #, c-format +msgid "height of revision %s not greater than that of parent" +msgstr "" + +#: database_check.cc:944 +#, c-format msgid "%d missing files" msgstr "%d file mancanti" -#: database_check.cc:799 +#: database_check.cc:946 #, c-format msgid "%d unreferenced files" msgstr "%d file senza referenze" -#: database_check.cc:802 +#: database_check.cc:949 #, c-format msgid "%d unreferenced rosters" msgstr "%d roster senza referenze" -#: database_check.cc:804 +#: database_check.cc:951 #, c-format msgid "%d incomplete rosters" msgstr "%d roster incompleti" -#: database_check.cc:807 +#: database_check.cc:954 #, c-format msgid "%d missing revisions" msgstr "%d revisioni mancanti" -#: database_check.cc:809 +#: database_check.cc:956 #, c-format msgid "%d incomplete revisions" msgstr "%d revisioni incomplete" -#: database_check.cc:811 +#: database_check.cc:958 #, c-format msgid "%d mismatched parents" msgstr "%d genitori non abbinati" -#: database_check.cc:813 +#: database_check.cc:960 #, c-format msgid "%d mismatched children" msgstr "%d figli non abbinati" -#: database_check.cc:815 +#: database_check.cc:962 #, c-format msgid "%d revisions with bad history" msgstr "%d revisioni con storia non valida" -#: database_check.cc:817 +#: database_check.cc:964 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)" msgstr "%d revisioni non leggibili (forse con percorsi invalidi)" -#: database_check.cc:820 +#: database_check.cc:967 #, c-format msgid "%d revisions not in normalized form" msgstr "%d revisioni non in forma normalizzata" -#: database_check.cc:824 +#: database_check.cc:971 #, c-format msgid "%d missing rosters" msgstr "%d roster mancanti" -#: database_check.cc:828 +#: database_check.cc:975 #, c-format msgid "%d missing keys" msgstr "%d chiavi mancanti" -#: database_check.cc:831 +#: database_check.cc:978 #, c-format msgid "%d missing certs" msgstr "%d certificati mancanti" -#: database_check.cc:833 +#: database_check.cc:980 #, c-format msgid "%d mismatched certs" msgstr "%d certificati non corrispondenti" -#: database_check.cc:835 +#: database_check.cc:982 #, c-format msgid "%d unchecked signatures due to missing keys" msgstr "%d firme non controllate per mancanza delle chiavi" -#: database_check.cc:837 +#: database_check.cc:984 #, c-format msgid "%d bad signatures" msgstr "%d firme non valide" -#: database_check.cc:861 +#: database_check.cc:987 +#, fuzzy, c-format +msgid "%d missing heights" +msgstr "%d certificati mancanti" + +#: database_check.cc:989 #, c-format -msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs" -msgstr "controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d certificati" +msgid "%d duplicate heights" +msgstr "" -#: database_check.cc:867 +#: database_check.cc:991 +#, fuzzy, c-format +msgid "%d incorrect heights" +msgstr "%d revisioni incomplete" + +#: database_check.cc:1017 +#, fuzzy, c-format +msgid "" +"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d " +"heights" +msgstr "" +"controllo completo: %d file; %d roster; %d revisioni; %d chiavi; %d " +"certificati" + +#: database_check.cc:1024 #, c-format msgid "total problems detected: %d (%d serious)" msgstr "numero totale di problemi individuati: %d (di cui %d gravi)" -#: database_check.cc:869 +#: database_check.cc:1026 #, c-format msgid "serious problems detected" msgstr "individuato un problema serio" -#: database_check.cc:871 +#: database_check.cc:1028 #, c-format msgid "minor problems detected" msgstr "individuato un problema minore" -#: database_check.cc:873 +#: database_check.cc:1030 #, c-format msgid "database is good" msgstr "il database non ha problemi" -#: database.cc:158 +#: database.cc:159 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -2026,12 +2025,12 @@ msgstr "" "prova ‘%s db migrate’ per aggiornarlo\n" "(operazione irreversibile; potresti voler prima fare una copia di backup)" -#: database.cc:172 +#: database.cc:173 #, c-format msgid "this database already contains rosters" msgstr "questo database contiene già dei roster" -#: database.cc:196 +#: database.cc:200 #, c-format msgid "" "database %s contains old-style revisions\n" @@ -2050,7 +2049,7 @@ msgstr "" " progetto, e poi esegui il ‘pull’ in un nuovo database.\n" "Scusa per l'inconveniete." -#: database.cc:206 +#: database.cc:210 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -2061,27 +2060,26 @@ msgstr "" "è un database molto vecchio; ha bisogno di essere aggiornato\n" "prego vedi README.changesets per dettagli" -#: database.cc:217 +#: database.cc:221 #, c-format msgid "" -"database %s contains revisions but no rosters\n" -"probably this is because an upgrade cleared the roster cache\n" -"run '%s db regenerate_rosters' to restore use of this database" +"database %s misses some cached data\n" +"run '%s db regenerate_caches' to restore use of this database" msgstr "" # TODO: "in" o "dal"? -#: database.cc:256 +#: database.cc:259 #, c-format msgid "unable to probe database version in file %s" msgstr "impossibile determinare la versione di database dal file ‘%s’" -#: database.cc:263 +#: database.cc:266 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" -msgstr "il database ‘%s’ non è un file SQLite versione 3, prova ‘dump’ e ‘reload’" +msgstr "" +"il database ‘%s’ non è un file SQLite versione 3, prova ‘dump’ e ‘reload’" -#: database.cc:292 -#: schema_migration.cc:201 +#: database.cc:293 schema_migration.cc:201 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -2089,8 +2087,7 @@ msgstr "" "assicurati che il database e la directory che lo contiene siano\n" "scrivibili e che tu non abbia esaurito lo spazio su disco" -#: database.cc:298 -#: schema_migration.cc:206 +#: database.cc:297 schema_migration.cc:206 #, c-format msgid "" "sqlite error: %s\n" @@ -2099,25 +2096,26 @@ msgstr "" "errore sqlite: %s\n" "%s" -#: database.cc:343 +#: database.cc:342 #, c-format msgid "could not initialize database: %s: already exists" msgstr "non posso inizializzare il database ‘%s’: esiste già" -#: database.cc:348 +#: database.cc:347 #, c-format msgid "" -"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n" +"existing (possibly stale) journal file '%s' has same stem as new database '%" +"s'\n" "cancelling database creation" msgstr "" -#: database.cc:498 +#: database.cc:497 #, c-format msgid "cannot create %s; it already exists" msgstr "non posso creare ‘%s’: esiste già" -#: database.cc:575 -#, c-format +#: database.cc:574 +#, fuzzy, c-format msgid "" "schema version : %s\n" "counts:\n" @@ -2137,6 +2135,7 @@ msgid "" " revisions : %u\n" " cached ancestry : %u\n" " certs : %u\n" +" heights : %u\n" " total : %u\n" "database:\n" " page size : %u\n" @@ -2165,52 +2164,52 @@ msgstr "" " dimensione pagine : %u\n" " dimensione cache : %u" -#: database.cc:638 +#: database.cc:639 #, c-format msgid "database schema version: %s" msgstr "versione dello schema del database: %s" -#: database.cc:715 +#: database.cc:716 #, c-format msgid "multiple statements in query: %s" msgstr "query con più di un comando: %s" -#: database.cc:721 +#: database.cc:722 #, c-format msgid "wanted %d columns got %d in query: %s" msgstr "mi aspettavo %d colonne e ne ho ottenute %d nella query ‘%s’" -#: database.cc:787 +#: database.cc:788 #, c-format msgid "null result in query: %s" msgstr "risultato nullo nella query: %s" -#: database.cc:805 +#: database.cc:806 #, c-format msgid "wanted %d rows got %d in query: %s" msgstr "mi aspettavo %d linee e ne ho ottenute %d nella query ‘%s’" -#: database.cc:1952 +#: database.cc:2040 #, c-format msgid "another key with name '%s' already exists" msgstr "esiste già un'altra chiave con nome ‘%s’" -#: database.cc:2949 +#: database.cc:3037 #, c-format msgid "no database specified" msgstr "nessuna database specificato" -#: database.cc:2957 +#: database.cc:3045 #, c-format msgid "database %s does not exist" msgstr "il database ‘%s’ non esiste" -#: database.cc:2958 +#: database.cc:3046 #, c-format msgid "%s is a directory, not a database" msgstr "‘%s’ è una directory, non un database" -#: database.cc:2983 +#: database.cc:3071 #, c-format msgid "could not open database '%s': %s" msgstr "non riesco ad aprire il database ‘%s’: %s" @@ -2245,8 +2244,7 @@ msgstr "" "[ destra] %s\n" "[ unione] %s" -#: file_io.cc:176 -#: file_io.cc:183 +#: file_io.cc:176 file_io.cc:183 #, c-format msgid "" "could not create directory '%s'\n" @@ -2326,10 +2324,10 @@ msgid "rename source file '%s' is a dire #: file_io.cc:255 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" -msgstr "il file sorgente da rinominare ‘%s’ è una directory -- bug in monotone?" +msgstr "" +"il file sorgente da rinominare ‘%s’ è una directory -- bug in monotone?" -#: file_io.cc:258 -#: file_io.cc:271 +#: file_io.cc:258 file_io.cc:271 #, c-format msgid "rename target '%s' already exists" msgstr "esiste già un'altra chiave con nome ‘%s’" @@ -2384,7 +2382,7 @@ msgstr "" msgid "caught runtime error %s constructing file path for %s" msgstr "" -#: file_io.cc:530 +#: file_io.cc:530 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "nessun file o directory con nome ‘%s’" @@ -2409,8 +2407,7 @@ msgstr "le passphrase non può essere vu msgid "empty passphrases not allowed, try again" msgstr "le passphrase non può essere vuota, riprova" -#: keys.cc:131 -#: keys.cc:138 +#: keys.cc:131 keys.cc:138 #, c-format msgid "too many failed passphrases" msgstr "troppe passphrase errate" @@ -2430,8 +2427,7 @@ msgstr "passphrase incorretta per ‘%sâ msgid "passphrase for '%s' is incorrect" msgstr "passphrase incorretta per ‘%s’" -#: lua.cc:462 -#: lua.cc:476 +#: lua.cc:462 lua.cc:476 #, c-format msgid "%s called with an invalid parameter" msgstr "‘%s’ chiamato con un parametro non valido" @@ -2441,9 +2437,7 @@ msgstr "La directory ‘%s’ non esiste msgid "Directory '%s' does not exist" msgstr "La directory ‘%s’ non esiste" -#: lua.cc:480 -#: rcs_import.cc:1235 -#: work.cc:1316 +#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "‘%s’ non è una directory" @@ -2474,18 +2468,12 @@ msgstr "l'hash del nodo non corrisponde: msgid "mismatched node hash value %s, expected %s" msgstr "l'hash del nodo non corrisponde: è %s ma era atteso %s" -# TODO: è giusta? verificare che file sia associato a xargs -#: monotone.cc:153 +#: monotone.cc:274 #, c-format -msgid "Invalid escape in --xargs file" -msgstr "Escape non validi in ‘--xargs file’" - -#: monotone.cc:683 -#, c-format msgid "Usage: %s [OPTION...] command [ARG...]" msgstr "Uso: %s [OPZIONI…] comando [ARGOMENTI…]" -#: monotone.cc:691 +#: monotone.cc:282 #, c-format msgid "Options specific to '%s %s':" msgstr "Opzioni specifiche per ‘%s %s’:" @@ -2533,11 +2521,15 @@ msgid "the remote side has a newer, inco #: netcmd.cc:125 msgid "the remote side has a newer, incompatible version of monotone" -msgstr "all'altro capo c'è una versione più nuova di monotone, non compatibile con questa" +msgstr "" +"all'altro capo c'è una versione più nuova di monotone, non compatibile con " +"questa" #: netcmd.cc:126 msgid "the remote side has an older, incompatible version of monotone" -msgstr "all'altro capo c'è una versione più vecchia di monotone, non compatibile con questa" +msgstr "" +"all'altro capo c'è una versione più vecchia di monotone, non compatibile con " +"questa" #: netcmd.cc:136 #, c-format @@ -2551,21 +2543,18 @@ msgstr "" "this suggests data was corrupted in transit" msgstr "" -#: netcmd.cc:272 -#: netcmd.cc:318 +#: netcmd.cc:272 netcmd.cc:318 #, c-format msgid "unknown role specifier %d" msgstr "specificatore di ruolo %d sconosciuto" -#: netio.hh:41 -#: netio.hh:59 +#: netio.hh:41 netio.hh:59 #, c-format msgid "need %d bytes to decode %s at %d, only have %d" msgstr "" # TODO: come tradurre "datum"? o "overflow"? -#: netio.hh:87 -#: netio.hh:122 +#: netio.hh:87 netio.hh:122 #, fuzzy, c-format msgid "uleb128 decode for '%s' into %d-byte datum overflowed" msgstr "la decodifica uleb128 per ‘%s’ in ***datum*** %d-byte ***overflow***" @@ -2578,7 +2567,9 @@ msgid "decoding variable length string o #: netio.hh:278 #, c-format msgid "decoding variable length string of %d bytes for '%s', maximum is %d" -msgstr "decodifica in corso della stringa a lungheza variabile di %d byte per ‘%s’, il massimo è %d" +msgstr "" +"decodifica in corso della stringa a lungheza variabile di %d byte per ‘%s’, " +"il massimo è %d" #: netio.hh:333 #, c-format @@ -2602,8 +2593,7 @@ msgstr "cert. ↓" msgid "certs in" msgstr "cert. ↓" -#: netsync.cc:732 -#: netsync.cc:745 +#: netsync.cc:732 netsync.cc:745 msgid "revs in" msgstr "rev. ↓" @@ -2611,8 +2601,7 @@ msgstr "cert. ↑" msgid "certs out" msgstr "cert. ↑" -#: netsync.cc:739 -#: netsync.cc:747 +#: netsync.cc:739 netsync.cc:747 msgid "revs out" msgstr "rev. ↑" @@ -2678,8 +2667,7 @@ msgstr "rifiutato un tentativo di connes msgid "rejected attempt at anonymous connection while running as sink" msgstr "rifiutato un tentativo di connessione anonima funzionando come pozzo" -#: netsync.cc:1372 -#: netsync.cc:1496 +#: netsync.cc:1372 netsync.cc:1496 #, c-format msgid "not serving branch '%s'" msgstr "il ramo ‘%s’ non è servito" @@ -2697,7 +2685,8 @@ msgid "allowed anonymous read/write perm #: netsync.cc:1391 #, c-format msgid "allowed anonymous read/write permission for '%s' excluding '%s'" -msgstr "concessi permessi di lettura/scrittura anonime a ‘%s’ con esclusione di ‘%s’" +msgstr "" +"concessi permessi di lettura/scrittura anonime a ‘%s’ con esclusione di ‘%s’" #: netsync.cc:1447 #, c-format @@ -2711,13 +2700,20 @@ msgstr "l'hash ‘%s’ della chiave pub #: netsync.cc:1484 #, c-format -msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink" -msgstr "negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ nel ruolo di pozzo" +msgid "" +"denied '%s' read permission for '%s' excluding '%s' while running as pure " +"sink" +msgstr "" +"negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ nel ruolo " +"di pozzo" #: netsync.cc:1501 #, c-format -msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" -msgstr "negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ a causa del ramo ‘%s’" +msgid "" +"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" +msgstr "" +"negato a ‘%s’ il permesso di lettura a ‘%s’ con esclusione di ‘%s’ a causa " +"del ramo ‘%s’" #: netsync.cc:1511 #, c-format @@ -2726,8 +2722,12 @@ msgstr "concessi a ‘%s’ permessi di #: netsync.cc:1521 #, c-format -msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source" -msgstr "negato a ‘%s’ il permesso di scrittura a ‘%s’ con esclusione di ‘%s’ nel ruolo di sorgente" +msgid "" +"denied '%s' write permission for '%s' excluding '%s' while running as pure " +"source" +msgstr "" +"negato a ‘%s’ il permesso di scrittura a ‘%s’ con esclusione di ‘%s’ nel " +"ruolo di sorgente" #: netsync.cc:1528 #, c-format @@ -2764,408 +2764,435 @@ msgstr "‘%s’ con hash ‘%s’ non à msgid "%s with hash '%s' does not exist in our database" msgstr "‘%s’ con hash ‘%s’ non è presente nel database" -#: netsync.cc:1857 +#: netsync.cc:1859 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." -msgstr "Epoca non corrispondente sul ramo ‘%s’: il server usa ‘%s’, il client usa ‘%s’." +msgstr "" +"Epoca non corrispondente sul ramo ‘%s’: il server usa ‘%s’, il client usa ‘%" +"s’." -#: netsync.cc:1875 +#: netsync.cc:1877 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" -msgstr "verifica dell'hash fallita per la chiave pubblica ‘%s’ (%s); atteso ‘%s’, ottenuto ‘%s’" +msgstr "" +"verifica dell'hash fallita per la chiave pubblica ‘%s’ (%s); atteso ‘%s’, " +"ottenuto ‘%s’" -#: netsync.cc:1889 +#: netsync.cc:1891 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "l'hash nel certificato della revisione %s non è corretto" -#: netsync.cc:1951 +#: netsync.cc:1953 #, c-format msgid "Received warning from usher: %s" msgstr "Ricevuto avvertimento dall'usciere: %s" -#: netsync.cc:2038 -#: netsync.cc:2069 +#: netsync.cc:2040 netsync.cc:2071 msgid "source and sink" msgstr "sorgente e pozzo" -#: netsync.cc:2039 -#: netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "source" msgstr "sorgente" -#: netsync.cc:2039 -#: netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "sink" msgstr "pozzo" -#: netsync.cc:2226 +#: netsync.cc:2228 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "" -#: netsync.cc:2238 -#: netsync.cc:2337 +#: netsync.cc:2240 netsync.cc:2339 #, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "errore di protocollo processando il peer %s: ‘%s’" -#: netsync.cc:2244 +#: netsync.cc:2246 #, c-format msgid "error: %s" msgstr "errore: %s" -#: netsync.cc:2308 +#: netsync.cc:2310 #, c-format msgid "connecting to %s" msgstr "connessione a ‘%s’" -#: netsync.cc:2352 +#: netsync.cc:2354 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting" msgstr "tempo disponibile finito aspettando I/O con peer ‘%s’, mi scollego" -#: netsync.cc:2375 +#: netsync.cc:2377 #, c-format msgid "processing failure while talking to peer %s, disconnecting" msgstr "ottenuto fallimento parlando col peer ‘%s’, mi scollego" -#: netsync.cc:2392 +#: netsync.cc:2394 #, c-format msgid "successful exchange with %s" msgstr "scambio con ‘%s’ avvenuto con successo" -#: netsync.cc:2398 +#: netsync.cc:2400 #, c-format msgid "peer %s disconnected after we informed them of error" msgstr "" # TODO: remove \n -#: netsync.cc:2403 +#: netsync.cc:2405 #, c-format msgid "I/O failure while talking to peer %s, disconnecting" msgstr "I/O fallito mentre parlavo col peer ‘%s’, mi scollego" -#: netsync.cc:2469 +#: netsync.cc:2471 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" -msgstr "errore di protocollo processando peer ‘%s’: ‘%s’, marcato come invalido" +msgstr "" +"errore di protocollo processando peer ‘%s’: ‘%s’, marcato come invalido" -#: netsync.cc:2501 +#: netsync.cc:2503 #, c-format msgid "accepted new client connection from %s : %s" msgstr "accettata connessione nuovo cliente da ‘%s’: ‘%s’" -#: netsync.cc:2538 +#: netsync.cc:2540 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" msgstr "errore di protocollo processando peer ‘%s’: ‘%s’, mi scollego" -#: netsync.cc:2549 +#: netsync.cc:2551 #, c-format msgid "peer %s read failed in working state (error)" msgstr "" -#: netsync.cc:2554 +#: netsync.cc:2556 #, c-format -msgid "peer %s read failed in shutdown state (possibly client misreported error)" +msgid "" +"peer %s read failed in shutdown state (possibly client misreported error)" msgstr "" -#: netsync.cc:2560 +#: netsync.cc:2562 #, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "" -#: netsync.cc:2581 +#: netsync.cc:2583 #, c-format msgid "peer %s write failed in working state (error)" msgstr "" -#: netsync.cc:2586 +#: netsync.cc:2588 #, c-format -msgid "peer %s write failed in shutdown state (possibly client misreported error)" +msgid "" +"peer %s write failed in shutdown state (possibly client misreported error)" msgstr "" -#: netsync.cc:2592 +#: netsync.cc:2594 #, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "" # TODO: "mi scollego", "sconnessione in corso", o che? (da cambiare in tutti) -#: netsync.cc:2619 +#: netsync.cc:2621 #, c-format msgid "peer %s processing finished, disconnecting" msgstr "il peer ‘%s’ ha finito, mi scollego" -#: netsync.cc:2641 +#: netsync.cc:2643 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting" msgstr "fd %d (peer %s) è stato fermo tropop a lungo, mi scollego" -#: netsync.cc:2709 +#: netsync.cc:2711 #, c-format msgid "beginning service on %s : %s" msgstr "attivo il servizio su %s : %s" -#: netsync.cc:2710 +#: netsync.cc:2712 msgid "" msgstr "" -#: netsync.cc:2724 +#: netsync.cc:2726 #, c-format msgid "session limit %d reached, some connections will be refused" -msgstr "numero limite di sessioni (%d) raggiunto, alcune connessioni verrano rifiutate" +msgstr "" +"numero limite di sessioni (%d) raggiunto, alcune connessioni verrano " +"rifiutate" -#: netsync.cc:2789 +#: netsync.cc:2791 #, c-format msgid "got OOB from peer %s, disconnecting" msgstr "ricevuti dati OOB dal peer ‘%s’, mi scollego" -#: netsync.cc:2849 +#: netsync.cc:2851 #, c-format msgid "beginning service on %s" msgstr "attivo il servizio su %s" # TODO: peer? -#: netsync.cc:2912 +#: netsync.cc:2914 #, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting" msgstr "ricevuti dati OOB su fd %d (peer ‘%s’), mi scollego" -#: netsync.cc:2961 +#: netsync.cc:2963 #, c-format msgid "finding items to synchronize:" msgstr "cerco elementi da sincronizzare:" -#: netsync.cc:2969 +#: netsync.cc:2971 msgid "certificates" msgstr "certificati" -#: netsync.cc:3082 +#: netsync.cc:3084 #, c-format msgid "Cannot find key '%s'" msgstr "Non trovo la chiave ‘%s’" -#: netsync.cc:3122 +#: netsync.cc:3124 #, c-format msgid "" "include branch pattern contains a quote character:\n" "%s" msgstr "" -#: netsync.cc:3128 +#: netsync.cc:3130 #, c-format msgid "" "exclude branch pattern contains a quote character:\n" "%s" msgstr "" -#: netsync.cc:3163 -#: netsync.cc:3167 +#: netsync.cc:3165 netsync.cc:3169 #, c-format msgid "network error: %s" msgstr "errore di rete: %s" -#: options_list.hh:2 -msgid "print debug log to stderr while running" -msgstr "stampa i log di debug su stderr" - -#: options_list.hh:3 -msgid "file to dump debugging log to, on failure" -msgstr "file su cui salvare i log di debug (in caso di fallimento)" - -#: options_list.hh:4 -msgid "file to write the log to" -msgstr "file su cui scrivere il registro" - -#: options_list.hh:5 -msgid "suppress verbose, informational and progress messages" -msgstr "" - -#: options_list.hh:6 -msgid "suppress warning, verbose, informational and progress messages" -msgstr "" - -#: options_list.hh:7 -msgid "display help message" -msgstr "mostra il messaggio di aiuto" - -#: options_list.hh:8 -msgid "print version number, then exit" -msgstr "stampa il numero di versione ed esce" - -#: options_list.hh:9 -msgid "print detailed version number, then exit" -msgstr "stampa il numero di versione dettagliato ed esce" - -#: options_list.hh:10 -msgid "insert command line arguments taken from the given file" -msgstr "" - -#: options_list.hh:11 -msgid "set ticker style (count|dot|none)" -msgstr "imposta lo stile del ticker (count|dot|none)" - -#: options_list.hh:12 -msgid "do not load standard lua hooks" -msgstr "non caricare gli hook standard Lua" - -#: options_list.hh:13 -msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" -msgstr "non caricare i file Lua ‘~/.monotone/monotonerc’ e ‘_MTN/monotonerc’" - -#: options_list.hh:14 -msgid "load extra rc file" -msgstr "carica un ulteriore file rc" - -#: options_list.hh:15 -msgid "set key for signatures" -msgstr "imposta chiave di firma" - -#: options_list.hh:16 -msgid "set name of database" -msgstr "imposta il nome del database" - -#: options_list.hh:17 -msgid "limit search for workspace to specified root" -msgstr "limita la ricerca di uno spazio di lavoro alla radice specificata" - -#: options_list.hh:18 -msgid "verbose completion output" -msgstr "output dettagliato" - #: options_list.hh:19 -msgid "set location of key store" -msgstr "imposta locazione del portachiavi" - -#: options_list.hh:20 -msgid "set location of configuration directory" -msgstr "imposta locazione della cartella di configurazione" - -#: options_list.hh:22 msgid "override author for commit" msgstr "forza l'autore del commit" -#: options_list.hh:23 +#: options_list.hh:27 msgid "block size in bytes for \"automate stdio\" output" msgstr "dimensione di blocco per l'output di ‘automate stdio’ (in byte)" -#: options_list.hh:24 +#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#, fuzzy, c-format +msgid "cannot be zero or negative" +msgstr "argomento illegale per ‘--last’: non può essere zero o negativo" + +#: options_list.hh:43 msgid "address:port to listen on (default :4691)" msgstr "indirizzo:porta su cui stare in ascolto (default ‘:4691’)" -#: options_list.hh:25 +#: options_list.hh:80 +msgid "disable transport authentication" +msgstr "disabilita l'autentificazione del trasporto" + +#: options_list.hh:87 +msgid "serve netsync on stdio" +msgstr "esegue il netsync tramite stdio" + +#: options_list.hh:96 msgid "select branch cert for operation" msgstr "seleziona il ramo per l'operazione" -#: options_list.hh:26 +#: options_list.hh:104 msgid "print a brief version of the normal output" msgstr "stampa una versione breve dell'output" -#: options_list.hh:27 -msgid "use context diff format" -msgstr "usa diff in formato con contesto" +#: options_list.hh:112 +msgid "set location of configuration directory" +msgstr "imposta locazione della cartella di configurazione" -#: options_list.hh:28 +#: options_list.hh:122 msgid "override date/time for commit" msgstr "forza data/ora del commit" -#: options_list.hh:29 +#: options_list.hh:143 +msgid "set name of database" +msgstr "imposta il nome del database" + +#: options_list.hh:151 +msgid "print debug log to stderr while running" +msgstr "stampa i log di debug su stderr" + +#: options_list.hh:159 msgid "limit the number of levels of directories to descend" msgstr "limita il numero di livelli di cartelle in cui discendere" -#: options_list.hh:30 +#: options_list.hh:164 +#, c-format +msgid "cannot be negative" +msgstr "" + +#: options_list.hh:173 +msgid "argument to pass external diff hook" +msgstr "argomenti da passare all'hook per le diff esterne" + +#: options_list.hh:182 +msgid "use context diff format" +msgstr "usa diff in formato con contesto" + +#: options_list.hh:189 +msgid "use external diff hook for generating diffs" +msgstr "utilizza l'hook per generare le diff esternamente" + +#: options_list.hh:196 +msgid "use unified diff format" +msgstr "usa diff in formato unificato" + +#: options_list.hh:204 +msgid "do not show the function containing each block of changes" +msgstr "non mostrare la funzione che contiene il blocco di modifiche" + +#: options_list.hh:211 msgid "print diffs along with logs" msgstr "stampa i diff assieme ai log" -#: options_list.hh:31 +#: options_list.hh:220 msgid "when rosterifying, drop attrs entries with the given key" msgstr "" -#: options_list.hh:32 +#: options_list.hh:228 +msgid "file to dump debugging log to, on failure" +msgstr "file su cui salvare i log di debug (in caso di fallimento)" + +#: options_list.hh:237 msgid "leave out anything described by its argument" msgstr "" -#: options_list.hh:33 +#: options_list.hh:245 msgid "perform the associated file operation" msgstr "esegue l'operazione associata al file" -#: options_list.hh:34 -msgid "use external diff hook for generating diffs" -msgstr "utilizza l'hook per generare le diff esternamente" +#: options_list.hh:253 +msgid "print detailed version number, then exit" +msgstr "stampa il numero di versione dettagliato ed esce" -#: options_list.hh:35 -msgid "argument to pass external diff hook" -msgstr "argomenti da passare all'hook per le diff esterne" +#: options_list.hh:260 +msgid "display help message" +msgstr "mostra il messaggio di aiuto" -#: options_list.hh:36 +#: options_list.hh:269 +msgid "include anything described by its argument" +msgstr "" + +#: options_list.hh:277 +msgid "set key for signatures" +msgstr "imposta chiave di firma" + +#: options_list.hh:285 +msgid "set location of key store" +msgstr "imposta locazione del portachiavi" + +#: options_list.hh:294 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: options_list.hh:37 +#: options_list.hh:304 msgid "limit log output to the last number of entries" msgstr "limita la stampa del log alle ultime N voci" -#: options_list.hh:38 +#: options_list.hh:313 +msgid "file to write the log to" +msgstr "file su cui scrivere il registro" + +#: options_list.hh:324 msgid "set commit changelog message" msgstr "imposta il messaggio di ChangeLog del commit" -#: options_list.hh:39 -msgid "perform the operations for files missing from workspace" -msgstr "" - -#: options_list.hh:40 +#: options_list.hh:331 msgid "set filename containing commit changelog message" msgstr "legge il messaggio di ChangeLog del commit da un file" -#: options_list.hh:41 +#: options_list.hh:339 +msgid "perform the operations for files missing from workspace" +msgstr "" + +#: options_list.hh:347 msgid "limit log output to the next number of entries" msgstr "limita la stampa del log alle N voci seguenti" -#: options_list.hh:42 +#: options_list.hh:357 msgid "exclude files when printing logs" msgstr "esclude i file dalla stampa dei log" -#: options_list.hh:43 +#: options_list.hh:365 +msgid "do not ignore any files" +msgstr "" + +#: options_list.hh:373 msgid "exclude merges when printing logs" msgstr "esclude i merge dalla stampa dei log" -#: options_list.hh:44 -msgid "do not show the function containing each block of changes" -msgstr "non mostrare la funzione che contiene il blocco di modifiche" +#: options_list.hh:381 +msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" +msgstr "non caricare i file Lua ‘~/.monotone/monotonerc’ e ‘_MTN/monotonerc’" -#: options_list.hh:45 -msgid "disable transport authentication" -msgstr "disabilita l'autentificazione del trasporto" +#: options_list.hh:389 +msgid "do not load standard lua hooks" +msgstr "non caricare gli hook standard Lua" -#: options_list.hh:46 +#: options_list.hh:397 msgid "record process id of server" msgstr "registra l'id del processo server" -#: options_list.hh:47 +#: options_list.hh:405 +msgid "suppress verbose, informational and progress messages" +msgstr "" + +#: options_list.hh:415 +msgid "load extra rc file" +msgstr "carica un ulteriore file rc" + +#: options_list.hh:423 +msgid "suppress warning, verbose, informational and progress messages" +msgstr "" + +#: options_list.hh:433 msgid "also operate on the contents of any listed directories" msgstr "opera anche sui contenuti delle directory specificate" -#: options_list.hh:48 +#: options_list.hh:442 msgid "select revision id for operation" msgstr "seleziona la revisione per l'operazione" -#: options_list.hh:49 +#: options_list.hh:450 +msgid "limit search for workspace to specified root" +msgstr "limita la ricerca di uno spazio di lavoro alla radice specificata" + +#: options_list.hh:458 msgid "use the current arguments as the future default" msgstr "usa gli argomenti attuali come default futuro" -#: options_list.hh:50 -msgid "serve netsync on stdio" -msgstr "esegue il netsync tramite stdio" +#: options_list.hh:466 +msgid "set ticker style (count|dot|none)" +msgstr "imposta lo stile del ticker (count|dot|none)" -#: options_list.hh:51 -msgid "use unified diff format" -msgstr "usa diff in formato unificato" +#: options_list.hh:477 +#, c-format +msgid "argument must be 'none', 'dot', or 'count'" +msgstr "" -#: options_list.hh:52 +#: options_list.hh:482 msgid "perform the operations for unknown files from workspace" msgstr "" +#: options_list.hh:490 +msgid "verbose completion output" +msgstr "output dettagliato" + +#: options_list.hh:498 +msgid "print version number, then exit" +msgstr "stampa il numero di versione ed esce" + +#: options_list.hh:506 +msgid "insert command line arguments taken from the given file" +msgstr "" + #: packet.cc:107 #, c-format msgid "file preimage '%s' missing in db" @@ -3181,10 +3208,7 @@ msgstr "manca un requisito: la revisione msgid "missing prerequisite revision '%s'" msgstr "manca un requisito: la revisione %s" -#: packet.cc:140 -#: packet.cc:151 -#: packet.cc:167 -#: packet.cc:175 +#: packet.cc:140 packet.cc:151 packet.cc:167 packet.cc:175 #, c-format msgid "dropping revision '%s'" msgstr "elimino la revisione %s" @@ -3234,7 +3258,8 @@ msgid "parse failure %d:%d: expecting %s #: rcs_file.cc:354 #, c-format msgid "parse failure %d:%d: expecting %s, got %s with value '%s'" -msgstr "errore sintattico %d:%d: mi aspettavo %s, ho ricevuto %s con valore ‘%s’" +msgstr "" +"errore sintattico %d:%d: mi aspettavo %s, ho ricevuto %s con valore ‘%s’" #: rcs_file.cc:373 #, c-format @@ -3284,48 +3309,52 @@ msgstr "etichette" msgid "tags" msgstr "etichette" -#: revision.cc:865 +#: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" msgstr "" -#: revision.cc:907 +#: revision.cc:883 #, c-format msgid "optimizing out redundant edge %d -> %d" msgstr "" -#: revision.cc:916 +#: revision.cc:892 #, c-format msgid "failed to eliminate edge %d -> %d" msgstr "fallita eliminazione di parentela %d -> %d" -#: revision.cc:927 +#: revision.cc:903 #, c-format msgid "rebuilding %d nodes" msgstr "ricostruisco %d nodi" # TODO: ? -#: revision.cc:1132 +#: revision.cc:1108 #, c-format msgid "Path %s added to child roster multiple times" msgstr "Percorso ‘%s’ aggiunto più volte al roster figlio" -#: revision.cc:1145 +#: revision.cc:1121 #, c-format msgid "Directory for path %s cannot be added, as there is a file in the way" -msgstr "La cartella per il percorso ‘%s’ non può essere aggiunta, dato che c'è già un file con lo stesso nome" +msgstr "" +"La cartella per il percorso ‘%s’ non può essere aggiunta, dato che c'è già " +"un file con lo stesso nome" -#: revision.cc:1156 +#: revision.cc:1132 #, c-format msgid "Path %s cannot be added, as there is a directory in the way" -msgstr "Il percorso ‘%s’ non può essere aggiunto, dato che c'è già una directory con lo stesso nome" +msgstr "" +"Il percorso ‘%s’ non può essere aggiunto, dato che c'è già una directory con " +"lo stesso nome" -#: revision.cc:1159 +#: revision.cc:1135 #, c-format msgid "Path %s added twice with differing content" msgstr "Percorso ‘%s’ aggiunto due volte con contenuti diversi" -#: revision.cc:1446 +#: revision.cc:1422 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3334,32 +3363,38 @@ msgstr "" "seriously, if you'd like to keep it, we're happy to figure out how)" msgstr "" -#: revision.cc:1559 +#: revision.cc:1535 #, c-format msgid "converting existing revision graph to new roster-style revisions" -msgstr "converto il grafo esistente delle revisioni al nuovo formato con roster" +msgstr "" +"converto il grafo esistente delle revisioni al nuovo formato con roster" -#: revision.cc:1614 +#: revision.cc:1590 #, c-format msgid "rebuilding revision graph from manifest certs" msgstr "ricostruisco il grafo delle revisioni dai certificati di manifesto" -#: revision.cc:1647 -#, c-format -msgid "regenerating cached rosters" +#: revision.cc:1668 +#, fuzzy, c-format +msgid "regenerating cached rosters and heights" msgstr "rigenera la cache dei roster" -#: revision.cc:1656 -#, c-format -msgid "calculating rosters to regenerate" -msgstr "calcolo i roster da rigenerare" - -#: revision.cc:1660 +#: revision.cc:1680 msgid "regenerated" msgstr "rigenerato" -#: revision.cc:1755 +#: revision.cc:1696 +#, fuzzy, c-format +msgid "finished regenerating cached rosters and heights" +msgstr "rigenera la cache dei roster" + +#: revision.cc:1708 #, c-format +msgid "cached height: %s" +msgstr "" + +#: revision.cc:1791 +#, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" "I only know how to understand the version '1' format\n" @@ -3418,7 +3453,9 @@ msgid "mismatched result of migration, g #: schema_migration.cc:311 #, c-format msgid "mismatched result of migration, got %s, wanted %s" -msgstr "risultati della migrazione diversi da quanto previsto: ho ottenuto ‘%s’ e mi aspettavo ‘%s’" +msgstr "" +"risultati della migrazione diversi da quanto previsto: ho ottenuto ‘%s’ e mi " +"aspettavo ‘%s’" #: schema_migration.cc:314 #, c-format @@ -3458,10 +3495,10 @@ msgstr "" "sull'esecuzione di ‘%s db %s’" #: schema_migration.cc:339 -#, c-format +#, fuzzy, c-format msgid "" -"NOTE: this upgrade cleared the roster cache\n" -"you should now run '%s db regenerate_rosters'" +"NOTE: this upgrade cleared monotone's caches\n" +"you should now run '%s db regenerate_caches'" msgstr "" "NOTA: questo aggiornamento ha svuotato la cache dei roster;\n" "adesso dovresti eseguire ‘%s db regenerate_rosters’" @@ -3474,7 +3511,9 @@ msgid "no migration performed; database #: schema_migration.cc:357 #, c-format msgid "no migration performed; database schema already up-to-date at %s" -msgstr "nessuna migrazione effettuata: lo schema del database era già aggiornato a ‘%s’" +msgstr "" +"nessuna migrazione effettuata: lo schema del database era già aggiornato a ‘%" +"s’" #: schema_migration.cc:916 #, c-format @@ -3533,7 +3572,8 @@ msgstr "" msgstr "" "errore fatale: %s\n" "questo è quasi sicuramente un bug in monotone.\n" -"per favore invia questo messaggio di errore, l'output di ‘%s --full-version’\n" +"per favore invia questo messaggio di errore, l'output di ‘%s --full-" +"version’\n" "e una descrizione di quello che stavi facendo a ‘%s’." #: ui.cc:581 @@ -3541,11 +3581,17 @@ msgstr "impossibile aprire il file di lo msgid "failed to open log file '%s'" msgstr "impossibile aprire il file di log ‘%s’" +#: uri.cc:63 +#, c-format +msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?" +msgstr "" + # TODO: verificare che 'testresult' sia il nome del certificato #: update.cc:72 #, c-format msgid "failed to decode boolean testresult cert value '%s'" -msgstr "è fallita la decodifica del valore booleano del certificato testresult ‘%s’" +msgstr "" +"è fallita la decodifica del valore booleano del certificato testresult ‘%s’" #: update.cc:166 #, c-format @@ -3593,9 +3639,7 @@ msgstr "HMAC di lunghezza non valida (%d msgid "Invalid hmac length of %d bytes" msgstr "HMAC di lunghezza non valida (%d byte)" -#: work.cc:88 -#: work_migration.cc:180 -#: work_migration.cc:200 +#: work.cc:88 work_migration.cc:180 work_migration.cc:200 #, c-format msgid "workspace is corrupt: reading %s: %s" msgstr "lo spazio di lavoro è corrotto: leggendo ‘%s’: %s" @@ -3620,79 +3664,78 @@ msgstr "Impossibile scrivere il file di msgid "Failed to write options file %s: %s" msgstr "Impossibile scrivere il file di opzioni ‘%s’: %s" -#: work.cc:539 +#: work.cc:541 #, c-format msgid "skipping ignorable file %s" msgstr "salto il file ignorabile ‘%s’" -#: work.cc:548 +#: work.cc:550 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "salto ‘%s’, già considerato nello spazio di lavoro" -#: work.cc:559 +#: work.cc:561 #, c-format msgid "adding %s to workspace manifest" msgstr "aggiungo ‘%s’ al manifesto dello spazio di lavoro" -#: work.cc:565 +#: work.cc:567 #, c-format -msgid "cannot add %s, because %s is recorded as a file in the workspace manifest" +msgid "" +"cannot add %s, because %s is recorded as a file in the workspace manifest" msgstr "" -#: work.cc:680 +#: work.cc:682 #, c-format msgid "dropping %s" msgstr "sto cancellando ‘%s’" -#: work.cc:691 -#: work.cc:702 +#: work.cc:693 work.cc:704 #, c-format msgid "path %s already exists" msgstr "il percorso ‘%s’ esiste già" -#: work.cc:724 -#: work.cc:751 +#: work.cc:726 work.cc:756 #, c-format msgid "adding %s" msgstr "aggiungo ‘%s’" -#: work.cc:740 +#: work.cc:744 #, c-format msgid "path '%s' already exists, cannot create" msgstr "il percorso ‘%s’ esiste già: non posso crearlo" -#: work.cc:747 +#: work.cc:752 #, c-format msgid "renaming %s to %s" msgstr "rinomino ‘%s’ in ‘%s’" -#: work.cc:782 +#: work.cc:787 #, c-format msgid "file '%s' does not exist" msgstr "il file ‘%s’ non esiste" -#: work.cc:783 +#: work.cc:788 #, c-format msgid "file '%s' is a directory" msgstr "il file ‘%s’ è una directory " -#: work.cc:788 +#: work.cc:793 #, c-format msgid "content of file '%s' has changed, not overwriting" msgstr "i contenuti del file ‘%s’ sono cambiati, non lo sovrascrivo" -#: work.cc:789 +#: work.cc:794 #, c-format msgid "modifying %s" msgstr "modifico ‘%s’" -#: work.cc:974 +#: work.cc:979 #, c-format msgid "missing %s" msgstr "manca ‘%s’" -#: work.cc:980 +#: work.cc:985 #, fuzzy, c-format msgid "" "%d missing files; use '%s ls missing' to view\n" @@ -3711,92 +3754,92 @@ msgstr "" " '%s drop --missing' or\n" " '%s revert --missing'" -#: work.cc:1113 +#: work.cc:1131 #, c-format msgid "skipping %s, not currently tracked" msgstr "salto ‘%s’, non sotto controllo di versione" -#: work.cc:1123 +#: work.cc:1141 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "non posso cancellare ‘%s/’: non è vuota" -#: work.cc:1134 +#: work.cc:1152 #, c-format msgid "dropping %s from workspace manifest" msgstr "elimino ‘%s’ dal manifesto dello spazio di lavoro" -#: work.cc:1187 -#, c-format -msgid "destination dir %s/ does not exist in current revision" +#: work.cc:1205 +#, fuzzy, c-format +msgid "destination dir %s/ is not versioned (perhaps add it?)" msgstr "la directory di destinazione ‘%s/’ non esiste nella revisione attuale" -#: work.cc:1190 +#: work.cc:1208 #, c-format msgid "destination %s is an existing file in current revision" msgstr "la destinazione ‘%s’ è un file già esistente nella versione attuale" -#: work.cc:1200 +#: work.cc:1218 #, c-format msgid "empty path %s is not allowed" msgstr "il percorso vuoto ‘%s’ non è permesso" -#: work.cc:1214 +#: work.cc:1232 #, c-format msgid "%s does not exist in current manifest" msgstr "‘%s’ non esiste nel manifesto attuale" -#: work.cc:1217 +#: work.cc:1235 #, c-format msgid "destination %s already exists in current manifest" msgstr "la destinazione ‘%s’ esiste già nel manifesto attuale" -#: work.cc:1223 +#: work.cc:1241 #, c-format msgid "destination directory %s does not exist in current manifest" msgstr "la directory di destinazione ‘%s’ non esiste nel manifesto attuale" -#: work.cc:1225 +#: work.cc:1243 #, c-format msgid "destination directory %s is not a directory" msgstr "la directory di destinazione ‘%s’ non è una directory" -#: work.cc:1234 +#: work.cc:1252 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "rinomino ‘%s’ in ‘%s’ nel manifesto dello spazio di lavoro" -#: work.cc:1262 +#: work.cc:1280 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "‘%s’ non esiste nello spazio di lavoro, lo salto" -#: work.cc:1266 +#: work.cc:1284 #, c-format msgid "destination %s already exists in workspace, skipping" msgstr "salto ‘%s’, esiste già nello spazio di lavoro" -#: work.cc:1296 +#: work.cc:1314 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" msgstr "la nuova directory root proposta ‘%s’ non è versionata o non esiste" -#: work.cc:1298 +#: work.cc:1316 #, c-format msgid "proposed new root directory '%s' is not a directory" msgstr "la nuova directory root proposta ‘%s’ non è una directory" -#: work.cc:1303 +#: work.cc:1321 #, c-format msgid "proposed new root directory '%s' contains illegal path %s" msgstr "la nuova directory root proposta ‘%s’ ha un percorso illegale %s" -#: work.cc:1313 +#: work.cc:1331 #, c-format msgid "directory '%s' is not versioned or does not exist" msgstr "la directory ‘%s’ non è versionata o non esiste" -#: work.cc:1319 +#: work.cc:1337 #, c-format msgid "'%s' is in the way" msgstr "‘%s’ è di ostacolo" @@ -3809,7 +3852,9 @@ msgid "_MTN/format should not exist in a #: work_migration.cc:71 #, c-format msgid "_MTN/format should not exist in a format 1 workspace; corrected" -msgstr "‘_MTN/format’ non dovrebbe esistere in uno spazio di lavoro con formato 1; corretto" +msgstr "" +"‘_MTN/format’ non dovrebbe esistere in uno spazio di lavoro con formato 1; " +"corretto" #: work_migration.cc:108 #, c-format @@ -3832,14 +3877,16 @@ msgstr "" "with versions of monotone older than %s." msgstr "" -#: work_migration.cc:127 -#: work_migration.cc:255 +#: work_migration.cc:127 work_migration.cc:255 #, c-format msgid "" "this version of monotone only understands workspace metadata\n" "in formats 0 through %d. your workspace is in format %d.\n" "you need a newer version of monotone to use this workspace." -msgstr "questa versione di monotone capisce gli spazi di lavoro con metadatinei formati da 0 a %d. il tuo spazio di lavoro è in formato %d.ti serve una versione di monotone più recente per usarlo." +msgstr "" +"questa versione di monotone capisce gli spazi di lavoro con metadatinei " +"formati da 0 a %d. il tuo spazio di lavoro è in formato %d.ti serve una " +"versione di monotone più recente per usarlo." #: work_migration.cc:156 #, c-format @@ -3860,5 +3907,27 @@ msgid "this workspace is in the current #: work_migration.cc:247 #, c-format msgid "this workspace is in the current format, no migration is necessary." -msgstr "questo spazio di lavoro è nel formato attuale, non è necessario migrare." +msgstr "" +"questo spazio di lavoro è nel formato attuale, non è necessario migrare." +#~ msgid "failed to parse date string '%s': %s" +#~ msgstr "impossibile interpretare la stringa ‘%s’ come data: %s" + +#~ msgid "negative depth not allowed" +#~ msgstr "profondità negativa non permessa" + +#~ msgid "illegal argument to --next: cannot be zero or negative" +#~ msgstr "argomento illegale per ‘--next’: non può essere zero o negativo" + +#~ msgid "" +#~ "illegal argument to --automate-stdio-size: cannot be zero or negative" +#~ msgstr "" +#~ "argomento illegale per ‘--automate-stdio-size’: non può essere zero o " +#~ "negativo" + +# TODO: è giusta? verificare che file sia associato a xargs +#~ msgid "Invalid escape in --xargs file" +#~ msgstr "Escape non validi in ‘--xargs file’" + +#~ msgid "calculating rosters to regenerate" +#~ msgstr "calcolo i roster da rigenerare" ============================================================ --- po/ja.po 8f094a686a4c59a86202b127f910d0f6efbb0572 +++ po/ja.po 9e1b79176947ef21a6eefc5f645440f8e2b9e94d @@ -7,7 +7,7 @@ msgstr "" msgstr "" "Project-Id-Version: monotone HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-02 16:49-0700\n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" "PO-Revision-Date: 2006-08-24 13:11+0200\n" "Last-Translator: Satoru SATOH \n" "Language-Team: Japanese \n" @@ -16,64 +16,164 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:141 +#: app_state.cc:129 #, c-format msgid "workspace required but not found%s%s" msgstr "ワークスペースが必要ですがみつかりませんでした%s%s" -#: app_state.cc:149 +#: app_state.cc:137 #, c-format msgid "invalid directory ''" msgstr "無効なディレクトリ ''" -#: app_state.cc:157 +#: app_state.cc:145 #, fuzzy, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "monotone 記録簿用ディレクトリ '%s' は既に '%s' 内に存在しています\n" -#: app_state.cc:238 +#: app_state.cc:201 #, c-format msgid "search root '%s' does not exist" msgstr "検索ルート '%s' は存在しません" -#: app_state.cc:239 -#, c-format -msgid "search root '%s' is not a directory\n" +#: app_state.cc:202 +#, fuzzy, c-format +msgid "search root '%s' is not a directory" msgstr "検索ルート '%s' はディレクトリではありません\n" -#: app_state.cc:273 +#: automate.cc:64 +msgid "[BRANCH]" +msgstr "" + +#: automate.cc:88 automate.cc:135 automate.cc:1206 +msgid "REV1 [REV2 [REV3 [...]]]" +msgstr "" + +#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330 +#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452 +#: automate.cc:1216 cmd_list.cc:662 revision.cc:1705 +#, fuzzy, c-format +msgid "No such revision %s" +msgstr "リビジョン '%s' は存在しません" + +#: automate.cc:183 automate.cc:324 +msgid "[REV1 [REV2 [REV3 [...]]]]" +msgstr "" + +#: automate.cc:215 +#, fuzzy +msgid "FILE" +msgstr "FILENAME" + +#: automate.cc:235 +#, fuzzy, c-format +msgid "file %s is unknown to the current workspace" +msgstr "ファイル '%s' はワークスペース内に存在しません" + +#: automate.cc:356 +msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" +msgstr "" + +#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 +#, fuzzy +msgid "REV" +msgstr "REVID" + +#: automate.cc:524 +msgid "SELECTOR" +msgstr "" + +#: automate.cc:893 automate.cc:1023 +#, fuzzy +msgid "[REVID]" +msgstr "REVID" + +#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 +#: automate.cc:1593 +#, fuzzy, c-format +msgid "no revision %s found in database" +msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" + +#: automate.cc:1066 automate.cc:1145 +msgid "FILEID" +msgstr "" + +#: automate.cc:1073 +#, fuzzy, c-format +msgid "no file version %s found in database" +msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" + +#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845 +msgid "REVID" +msgstr "REVID" + +#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 +#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format -msgid "failed to parse date string '%s': %s" -msgstr "データ文字列 '%s' の解析に失敗: %s" +msgid "no such revision '%s'" +msgstr "リビジョン '%s' は存在しません" -#: app_state.cc:288 +#: automate.cc:1156 +#, fuzzy, c-format +msgid "no such file '%s'" +msgstr "リビジョン '%s' は存在しません" + +#: automate.cc:1172 +msgid "OLD_FILE NEW_FILE" +msgstr "" + +#: automate.cc:1317 +msgid "[BRANCH_PATTERN]" +msgstr "" + +#: automate.cc:1413 +msgid "KEYID PASSPHRASE" +msgstr "" + +#: automate.cc:1431 cmd_key_cert.cc:42 #, c-format -msgid "negative depth not allowed\n" -msgstr "深さの値を負にすることはできません\n" +msgid "key '%s' already exists" +msgstr "鍵 '%s' は既に存在しています" -#: app_state.cc:296 +#: automate.cc:1434 cmd_key_cert.cc:45 #, c-format -msgid "illegal argument to --last: cannot be zero or negative\n" -msgstr "" +msgid "generating key-pair '%s'" +msgstr "鍵対 '%s' を生成しています" -#: app_state.cc:304 +#: automate.cc:1436 cmd_key_cert.cc:47 #, c-format -msgid "illegal argument to --next: cannot be zero or negative\n" +msgid "storing key-pair '%s' in %s/" +msgstr "鍵対 '%s' を %s/ に保存しています" + +#: automate.cc:1472 +msgid "OPTION" msgstr "" -#: app_state.cc:440 +#: automate.cc:1495 #, c-format -msgid "Failed to read options file %s" -msgstr "オプションファイル '%s' の解析に失敗" +msgid "'%s' is not a recognized workspace option" +msgstr "" -#: app_state.cc:457 -#, c-format -msgid "Failed to write options file %s" -msgstr "オプションファイル '%s' の書き込みに失敗" +#: automate.cc:1518 +#, fuzzy +msgid "REV FILE" +msgstr "REV REV" +#: automate.cc:1535 automate.cc:1599 +#, fuzzy, c-format +msgid "file %s is unknown for revision %s" +msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" + +#: automate.cc:1578 +#, fuzzy +msgid "REV1 FILE REV2" +msgstr "REV REV" + #: basic_io.cc:33 -#, c-format -msgid "error in %s:%d:%d:E: %s" +#, fuzzy, c-format +msgid "parsing a %s at %d:%d:E: %s" msgstr "エラー %s:%d:%d:E: %s" #: cert.cc:83 @@ -101,12 +201,12 @@ msgstr "計算した証明ハッシュ ' msgid "calculated cert hash '%s' does not match '%s'" msgstr "計算した証明ハッシュ '%s' は '%s' と一致しません" -#: cert.cc:379 keys.cc:554 +#: cert.cc:387 keys.cc:560 #, c-format msgid "no key pair '%s' found in key store '%s'" msgstr "鍵対 '%s' は鍵の保存場所 '%s' にはありません" -#: cert.cc:457 +#: cert.cc:465 #, c-format msgid "" "you have no private key to make signatures with\n" @@ -115,7 +215,7 @@ msgstr "" "署名するための秘密鍵がありません。\n" "おそらく 'genkey <あなたのメールアドレス>' とする必要があります。" -#: cert.cc:460 +#: cert.cc:468 #, c-format msgid "" "you have multiple private keys\n" @@ -124,48 +224,47 @@ msgstr "" "複数の秘密鍵があります。\n" "'-k' をコマンドに追加して署名に使うものを選択して下さい。" -#: cert.cc:478 +#: cert.cc:485 #, c-format msgid "no branch found for empty revision, please provide a branch name" msgstr "リビジョンが空のブランチはありません. ブランチ名を指定して下さい" -#: cert.cc:487 +#: cert.cc:494 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" msgstr "" "リビジョン %s のブランチ証明がみつかりません. ブランチ名を指定して下さい" -#: cert.cc:491 +#: cert.cc:498 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" msgstr "リビジョン %s のブランチ証明は複数あります. ブランチ名を指定して下さい" -#: cmd_automate.cc:205 +#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 +#: cmd_automate.cc:340 +#, fuzzy, c-format +msgid "Bad input to automate stdio" +msgstr "parse_basic_io に対し不正な入力" + +#: cmd_automate.cc:168 #, c-format msgid "read from client failed with error code: %d" msgstr "" -#: cmd_automate.cc:248 +#: cmd_automate.cc:169 #, fuzzy, c-format -msgid "Bad input to automate stdio" +msgid "Bad input to automate stdio (unexpected EOF)" msgstr "parse_basic_io に対し不正な入力" -#: cmd_automate.cc:301 +#: cmd_automate.cc:365 msgid "automation" msgstr "自動化" -#: cmd_automate.cc:302 +#: cmd_automate.cc:366 msgid "automation interface" msgstr "自動化インターフェース" -#: cmd_db.cc:35 cmd_diff_log.cc:387 cmd_diff_log.cc:419 cmd_diff_log.cc:421 -#: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:146 cmd_merging.cc:699 -#: cmd_merging.cc:714 cmd_merging.cc:717 cmd_ws_commit.cc:453 commands.cc:393 -#, c-format -msgid "no such revision '%s'" -msgstr "リビジョン '%s' は存在しません" - #: cmd_db.cc:41 #, c-format msgid "revision %s already has children. We cannot kill it." @@ -176,6 +275,7 @@ msgstr "データベース" msgstr "データベース" #: cmd_db.cc:47 +#, fuzzy msgid "" "init\n" "info\n" @@ -190,6 +290,7 @@ msgid "" "check\n" "changesetify\n" "rosterify\n" +"regenerate_caches\n" "set_epoch BRANCH EPOCH\n" msgstr "" "init\n" @@ -207,79 +308,83 @@ msgstr "" "rosterify\n" "set_epoch BRANCH EPOCH\n" -#: cmd_db.cc:61 +#: cmd_db.cc:62 msgid "manipulate database state" msgstr "データベースの状態を操作" -#: cmd_db.cc:108 +#: cmd_db.cc:111 #, c-format msgid "The epoch must be %s characters" msgstr "epoch は %s 文字でなければいけません" -#: cmd_db.cc:119 cmd_db.cc:135 +#: cmd_db.cc:122 cmd_db.cc:138 msgid "vars" msgstr "変数" -#: cmd_db.cc:119 +#: cmd_db.cc:122 msgid "DOMAIN NAME VALUE" msgstr "DOMAIN NAME VALUE" -#: cmd_db.cc:120 +#: cmd_db.cc:123 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "ドメイン DOMAIN のデータベース変数 NAME を VALUE に設定" -#: cmd_db.cc:135 +#: cmd_db.cc:138 msgid "DOMAIN NAME" msgstr "DOMAIN NAME" -#: cmd_db.cc:136 +#: cmd_db.cc:139 msgid "remove the database variable NAME in domain DOMAIN" msgstr "ドメイン DOMAIN のデータベース変数 NAME を消去" -#: cmd_db.cc:148 +#: cmd_db.cc:151 #, c-format msgid "no var with name %s in domain %s" msgstr "%s という変数はドメイン %s 内にはありません" -#: cmd_db.cc:152 cmd_diff_log.cc:331 cmd_diff_log.cc:543 cmd_files.cc:114 -#: cmd_files.cc:181 cmd_list.cc:448 cmd_merging.cc:636 cmd_ws_commit.cc:328 -#: commands.cc:248 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 +#: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 +#: commands.cc:275 msgid "informative" msgstr "情報" -#: cmd_db.cc:152 +#: cmd_db.cc:155 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) PARTIAL-ID" -#: cmd_db.cc:153 +#: cmd_db.cc:156 msgid "complete partial id" msgstr "部分 ID を補完" -#: cmd_db.cc:162 +#: cmd_db.cc:165 #, c-format msgid "non-hex digits in partial id" msgstr "部分 ID に十六進数が含まれていません" -#: cmd_diff_log.cc:331 cmd_ws_commit.cc:53 cmd_ws_commit.cc:222 -#: cmd_ws_commit.cc:250 cmd_ws_commit.cc:328 cmd_ws_commit.cc:620 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[PATH]..." -#: cmd_diff_log.cc:332 +#: cmd_diff_log.cc:466 #, fuzzy msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" -"that revision is shown. If two revisions are given, the diff\n" -"between them is given. If no format is specified, unified\n" -"is used by default." +"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 "" "現在の差分を標準出力に表示\n" "リビジョンが一つ指定されていれば、ワークスペースとそのリビジョンの\n" "差分を、二つ指定されていればそれらリビジョン間の差分を表示します。\n" "形式が指定されていなければ、デフォルトでは unified 形式を使用します。" -#: cmd_diff_log.cc:347 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -288,30 +393,35 @@ msgstr "" "--diff-args は --external を必要とします。\n" "--external を追加するか、--diff-args を省いてみてはどうですか?" -#: cmd_diff_log.cc:479 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "変更なし" -#: cmd_diff_log.cc:543 +#: cmd_diff_log.cc:520 +#, fuzzy +msgid "[FILE [...]]" +msgstr "[FILE] ..." + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[FILE] ..." -#: cmd_diff_log.cc:544 +#: cmd_diff_log.cc:604 #, fuzzy msgid "" -"print history in reverse order (filtering by 'FILE'). If one or more " +"print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." msgstr "" "降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n" "いればそれを開始点として利用。" -#: cmd_diff_log.cc:607 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "--last/--next のどちらかのみが許されています" #: cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 cmd_files.cc:157 -#: cmd_merging.cc:864 cmd_othervcs.cc:15 +#: cmd_merging.cc:845 cmd_othervcs.cc:15 msgid "debug" msgstr "デバッグ" @@ -410,26 +520,31 @@ msgstr "ファイル '%s' はリビジムmsgid "no file '%s' found in revision '%s'" msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" -#: cmd.hh:97 +#: cmd.hh:89 #, c-format msgid "non-hex digits in id" msgstr "ID に十六進数が含まれていません" -#: cmd.hh:106 +#: cmd.hh:98 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "部分 ID '%s' を一つの ID に展開することはできません" -#: cmd.hh:110 -#, c-format -msgid "partial id '%s' has multiple ambiguous expansions:\n" +#: cmd.hh:102 +#, fuzzy, c-format +msgid "partial id '%s' has multiple ambiguous expansions:" msgstr "'%s' だけでは曖昧で、展開できる ID の候補は複数あります:\n" -#: cmd.hh:118 +#: cmd.hh:110 #, fuzzy, c-format msgid "expanded partial id '%s' to '%s'" msgstr "部分 ID '%s' を '%s' に展開\n" +#: cmd.hh:195 +#, c-format +msgid "Alias for %s" +msgstr "" + #: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 #: cmd_key_cert.cc:113 cmd_key_cert.cc:149 msgid "key and cert" @@ -439,25 +554,10 @@ msgstr "KEYID" msgid "KEYID" msgstr "KEYID" -#: cmd_key_cert.cc:27 +#: cmd_key_cert.cc:26 msgid "generate an RSA key-pair" msgstr "鍵対を生成" -#: cmd_key_cert.cc:42 -#, c-format -msgid "key '%s' already exists" -msgstr "鍵 '%s' は既に存在しています" - -#: cmd_key_cert.cc:45 -#, c-format -msgid "generating key-pair '%s'" -msgstr "鍵対 '%s' を生成しています" - -#: cmd_key_cert.cc:47 -#, c-format -msgid "storing key-pair '%s' in %s/" -msgstr "鍵対 '%s' を %s/ に保存しています" - #: cmd_key_cert.cc:53 msgid "drop a public and private key" msgstr "公開鍵と秘密鍵を破棄" @@ -519,13 +619,13 @@ msgstr "現在の設定で仮想証明だmsgstr "現在の設定で仮想証明が信頼可能かテスト" #: cmd_key_cert.cc:184 -#, c-format +#, fuzzy, c-format msgid "" "if a cert on: %s\n" "with key: %s\n" "and value: %s\n" "was signed by: %s\n" -"it would be: %s\n" +"it would be: %s" msgstr "" "証明 : %s\n" "鍵 : %s\n" @@ -541,59 +641,59 @@ msgstr "UNtrusted" msgid "UNtrusted" msgstr "UNtrusted" -#: cmd_key_cert.cc:196 cmd_key_cert.cc:209 cmd_key_cert.cc:222 -#: cmd_key_cert.cc:238 cmd_ws_commit.cc:169 +#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:189 msgid "review" msgstr "レビュー" -#: cmd_key_cert.cc:196 +#: cmd_key_cert.cc:197 msgid "REVISION TAGNAME" msgstr "REVISION TAGNAME" -#: cmd_key_cert.cc:197 +#: cmd_key_cert.cc:198 msgid "put a symbolic tag cert on a revision" msgstr "記号的なタグ証明をリビジョンに付加" -#: cmd_key_cert.cc:209 +#: cmd_key_cert.cc:210 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: cmd_key_cert.cc:210 +#: cmd_key_cert.cc:211 msgid "note the results of running a test on a revision" msgstr "リビジョンのテストの実行結果を記録" -#: cmd_key_cert.cc:222 cmd_ws_commit.cc:169 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:189 msgid "REVISION" msgstr "REVISION" -#: cmd_key_cert.cc:223 +#: cmd_key_cert.cc:224 msgid "approve of a particular revision" msgstr "特定のリビジョンを承認" -#: cmd_key_cert.cc:234 +#: cmd_key_cert.cc:235 #, c-format msgid "need --branch argument for approval" msgstr "承認には --branch 引数が必要です" -#: cmd_key_cert.cc:238 +#: cmd_key_cert.cc:239 msgid "REVISION [COMMENT]" msgstr "REVISION [COMMENT]" -#: cmd_key_cert.cc:239 +#: cmd_key_cert.cc:240 msgid "comment on a particular revision" msgstr "特定のリビジョンにコメント" -#: cmd_key_cert.cc:249 +#: cmd_key_cert.cc:252 #, c-format msgid "edit comment failed" msgstr "コメント編集に失敗" -#: cmd_key_cert.cc:252 +#: cmd_key_cert.cc:257 #, c-format msgid "empty comment" msgstr "空のコメント" -#: cmd_list.cc:64 cmd_list.cc:666 +#: cmd_list.cc:64 cmd_list.cc:676 #, c-format msgid "no public key '%s' found in database" msgstr "データベース内に公開鍵 '%s' はありません" @@ -643,7 +743,7 @@ msgstr "ブランチ %s は epoch を持 msgid "no epoch for branch %s" msgstr "ブランチ %s は epoch を持ちません\n" -#: cmd_list.cc:449 +#: cmd_list.cc:459 #, fuzzy msgid "" "certs ID\n" @@ -670,7 +770,7 @@ msgstr "" "missing\n" "changed" -#: cmd_list.cc:460 +#: cmd_list.cc:470 #, fuzzy msgid "" "show database objects, or the current workspace manifest, \n" @@ -680,23 +780,13 @@ msgstr "" "データベースオブジェクト、現在のワークスペースのマニフェスト、\n" "既知または不明な、意図的に無視、または失なわれた状態のファイルを表示" -#: cmd_list.cc:642 -#, fuzzy -msgid "REV" -msgstr "REVID" - -#: cmd_list.cc:652 -#, fuzzy, c-format -msgid "No such revision %s" -msgstr "リビジョン '%s' は存在しません" - -#: cmd_merging.cc:94 cmd_merging.cc:677 cmd_ws_commit.cc:53 -#: cmd_ws_commit.cc:222 cmd_ws_commit.cc:250 cmd_ws_commit.cc:284 -#: cmd_ws_commit.cc:309 cmd_ws_commit.cc:522 cmd_ws_commit.cc:620 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66 +#: cmd_ws_commit.cc:252 cmd_ws_commit.cc:293 cmd_ws_commit.cc:329 +#: cmd_ws_commit.cc:354 cmd_ws_commit.cc:579 cmd_ws_commit.cc:679 msgid "workspace" msgstr "ワークスペース" -#: cmd_merging.cc:95 +#: cmd_merging.cc:74 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -709,17 +799,17 @@ msgstr "" "コミットされていない変更はそのままにされます。リビジョンを指定して\n" "いればそのリビジョンに、未指定なら最新版 (HEAD) に更新します。" -#: cmd_merging.cc:116 +#: cmd_merging.cc:95 #, c-format msgid "this workspace is a new project; cannot update" msgstr "このワークスペースは新規のプロジェクトです; 更新できません。" -#: cmd_merging.cc:123 +#: cmd_merging.cc:102 #, fuzzy, c-format msgid "updating along branch '%s'" msgstr "ブランチ '%s' に沿って更新しています..." -#: cmd_merging.cc:127 +#: cmd_merging.cc:106 #, fuzzy, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -730,37 +820,37 @@ msgstr "" "もしかしたら --revision=<他のブランチのリビジョン> としたいのでは\n" "ありませんか?" -#: cmd_merging.cc:133 +#: cmd_merging.cc:112 #, c-format msgid "multiple update candidates:" msgstr "複数の更新候補:" -#: cmd_merging.cc:137 +#: cmd_merging.cc:116 #, c-format msgid "choose one with '%s update -r'" msgstr "'%s update -r' として一つ選択" -#: cmd_merging.cc:138 +#: cmd_merging.cc:117 #, c-format msgid "multiple update candidates remain after selection" msgstr "選択後も複数の候補が残っています" -#: cmd_merging.cc:157 +#: cmd_merging.cc:136 #, fuzzy, c-format msgid "already up to date at %s" msgstr "%s は既に最新です\n" -#: cmd_merging.cc:165 +#: cmd_merging.cc:144 #, fuzzy, c-format msgid "selected update target %s" msgstr "選択された更新ターゲット %s\n" -#: cmd_merging.cc:192 +#: cmd_merging.cc:171 #, fuzzy, c-format msgid "target revision is not in current branch" msgstr "現在のリビジョンには祖先がありません" -#: cmd_merging.cc:200 +#: cmd_merging.cc:179 #, fuzzy, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -772,213 +862,213 @@ msgstr "" "\n" "明示的に --branch を指定して再試行して下さい。" -#: cmd_merging.cc:208 +#: cmd_merging.cc:187 #, fuzzy, c-format msgid "switching to branch %s" msgstr "ブランチ '%s' についてコミット開始\n" -#: cmd_merging.cc:213 +#: cmd_merging.cc:192 #, c-format msgid "" "target revision not in any branch\n" "next commit will use branch %s" msgstr "" -#: cmd_merging.cc:284 +#: cmd_merging.cc:262 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "" -#: cmd_merging.cc:285 +#: cmd_merging.cc:263 #, fuzzy, c-format msgid "updated to base revision %s" msgstr "基準リビジョン %s に更新\n" -#: cmd_merging.cc:323 +#: cmd_merging.cc:301 #, fuzzy, c-format msgid "[left] %s" msgstr "[先] %s\n" -#: cmd_merging.cc:324 +#: cmd_merging.cc:302 #, fuzzy, c-format msgid "[right] %s" msgstr "[先] %s\n" -#: cmd_merging.cc:335 cmd_merging.cc:606 +#: cmd_merging.cc:313 cmd_merging.cc:584 #, fuzzy, c-format msgid "[merged] %s" msgstr "[統合済み] %s\n" -#: cmd_merging.cc:342 cmd_merging.cc:441 cmd_merging.cc:452 cmd_merging.cc:610 -#: cmd_merging.cc:840 cmd_ws_commit.cc:392 cmd_ws_commit.cc:859 -#: cmd_ws_commit.cc:880 +#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588 +#: cmd_merging.cc:821 cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 msgid "tree" msgstr "ツリー" -#: cmd_merging.cc:342 +#: cmd_merging.cc:320 msgid "merge unmerged heads of branch" msgstr "統合されていないブランチの複数の最新版を統合" -#: cmd_merging.cc:352 cmd_merging.cc:848 +#: cmd_merging.cc:330 cmd_merging.cc:829 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "--branch=BRANCH というようにブランチを指定して下さい" -#: cmd_merging.cc:357 cmd_merging.cc:491 cmd_merging.cc:494 cmd_merging.cc:853 -#: cmd_ws_commit.cc:437 +#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 +#: cmd_ws_commit.cc:463 #, c-format msgid "branch '%s' is empty" msgstr "ブランチ '%s' は空です" -#: cmd_merging.cc:360 +#: cmd_merging.cc:338 #, fuzzy, c-format msgid "branch '%s' is already merged" msgstr "ブランチ '%s' は既に統合済みです\n" -#: cmd_merging.cc:364 +#: cmd_merging.cc:342 #, fuzzy, c-format msgid "%d head on branch '%s'" msgid_plural "%d heads on branch '%s'" msgstr[0] "ブランチ '%s' に沿って更新しています..." -#: cmd_merging.cc:385 cmd_merging.cc:430 +#: cmd_merging.cc:363 cmd_merging.cc:408 #, fuzzy, c-format msgid "merge %d / %d:" msgstr "[統合済み] %s\n" -#: cmd_merging.cc:386 +#: cmd_merging.cc:364 #, c-format msgid "calculating best pair of heads to merge next" msgstr "" -#: cmd_merging.cc:438 +#: cmd_merging.cc:416 #, fuzzy, c-format msgid "note: your workspaces have not been updated" msgstr "注意: ワークスペースは更新されていません\n" -#: cmd_merging.cc:441 +#: cmd_merging.cc:419 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "SOURCE-BRANCH DEST-BRANCH" -#: cmd_merging.cc:442 +#: cmd_merging.cc:420 msgid "merge from one branch to another asymmetrically" msgstr "一方のブランチを他方に非同期に統合" -#: cmd_merging.cc:452 +#: cmd_merging.cc:430 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "SOURCE-BRANCH DEST-BRANCH DIR" -#: cmd_merging.cc:453 +#: cmd_merging.cc:431 msgid "merge one branch into a subdirectory in another branch" msgstr "ブランチを他のブランチのサブディレクトリに統合" -#: cmd_merging.cc:492 cmd_merging.cc:495 +#: cmd_merging.cc:470 cmd_merging.cc:473 #, fuzzy, c-format msgid "branch '%s' is not merged" msgstr "ブランチ '%s' は統合されていません\n" -#: cmd_merging.cc:500 +#: cmd_merging.cc:478 #, fuzzy, c-format msgid "propagating %s -> %s" msgstr "伝播中 %s -> %s\n" -#: cmd_merging.cc:501 +#: cmd_merging.cc:479 #, fuzzy, c-format msgid "[source] %s" msgstr "[元] %s\n" -#: cmd_merging.cc:502 +#: cmd_merging.cc:480 #, fuzzy, c-format msgid "[target] %s" msgstr "[先] %s\n" -#: cmd_merging.cc:507 +#: cmd_merging.cc:485 #, fuzzy, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "ブランチ '%s' はブランチ '%s' に対して最新です\n" -#: cmd_merging.cc:509 +#: cmd_merging.cc:487 #, fuzzy, c-format msgid "no action taken" msgstr "何もしません\n" -#: cmd_merging.cc:513 +#: cmd_merging.cc:491 #, fuzzy, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "統合は必要ありません. %s をブランチ '%s' 内に取り込み中\n" -#: cmd_merging.cc:551 +#: cmd_merging.cc:529 #, c-format msgid "Path %s not found in destination tree." msgstr "パス %s は先のツリー内にみつかりません" -#: cmd_merging.cc:611 +#: cmd_merging.cc:589 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" -#: cmd_merging.cc:612 +#: cmd_merging.cc:590 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "明示的に指定した二つのリビジョンを統合。結果は指定ブランチへ。" -#: cmd_merging.cc:627 +#: cmd_merging.cc:605 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s と %s は同じリビジョンです. 中止します" -#: cmd_merging.cc:629 cmd_merging.cc:631 +#: cmd_merging.cc:607 cmd_merging.cc:609 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s は既に %s の祖先となっています" -#: cmd_merging.cc:636 +#: cmd_merging.cc:614 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:637 +#: cmd_merging.cc:615 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "指定のリビジョンを統合するのに解決が必要な衝突を表示" -#: cmd_merging.cc:647 cmd_merging.cc:649 +#: cmd_merging.cc:625 cmd_merging.cc:627 #, fuzzy, c-format msgid "%s is an ancestor of %s; no merge is needed." msgstr "%s は %s の祖先; 統合は必要ありません" -#: cmd_merging.cc:663 +#: cmd_merging.cc:641 #, c-format msgid "There are %s node_name_conflicts." msgstr "%s node_name_conflicts があります" -#: cmd_merging.cc:665 +#: cmd_merging.cc:643 #, c-format msgid "There are %s file_content_conflicts." msgstr "%s file_content_conflicts があります" -#: cmd_merging.cc:667 +#: cmd_merging.cc:645 #, c-format msgid "There are %s node_attr_conflicts." msgstr "%s node_attr_conflicts があります" -#: cmd_merging.cc:669 +#: cmd_merging.cc:647 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "%s orphaned_node_conflicts があります" -#: cmd_merging.cc:671 +#: cmd_merging.cc:649 #, c-format msgid "There are %s rename_target_conflicts." msgstr "%s rename_target_conflicts があります" -#: cmd_merging.cc:673 +#: cmd_merging.cc:651 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "%s directory_loop_conflicts があります" -#: cmd_merging.cc:677 +#: cmd_merging.cc:655 msgid "[-r FROM] -r TO [PATH...]" msgstr "" -#: cmd_merging.cc:678 +#: cmd_merging.cc:656 msgid "" "Apply changes made at arbitrary places in history to current workspace.\n" "This command takes changes made at any point in history, and\n" @@ -994,7 +1084,7 @@ msgstr "" "first revision to the second." msgstr "" -#: cmd_merging.cc:703 +#: cmd_merging.cc:681 #, c-format msgid "" "revision %s is a merge\n" @@ -1002,117 +1092,123 @@ msgstr "" " %s pluck -r PARENT -r %s" msgstr "" -#: cmd_merging.cc:724 +#: cmd_merging.cc:702 #, fuzzy, c-format msgid "no changes to apply" msgstr "コミットする変更がありません\n" -#: cmd_merging.cc:816 +#: cmd_merging.cc:759 #, fuzzy, c-format +msgid "no changes to be applied" +msgstr "コミットする変更がありません\n" + +#: cmd_merging.cc:786 +#, fuzzy, c-format +msgid "no changes were applied" +msgstr "コミットする変更がありません\n" + +#: cmd_merging.cc:789 +#, fuzzy, c-format msgid "applied changes to workspace" msgstr "ファイルをワークスペースに追加" -#: cmd_merging.cc:840 +#: cmd_merging.cc:821 msgid "show unmerged head revisions of branch" msgstr "ブランチの統合されていない最新リビジョンを表示" -#: cmd_merging.cc:855 +#: cmd_merging.cc:836 #, fuzzy, c-format msgid "branch '%s' is currently merged:" msgstr "ブランチ '%s' は現在統合済みです:\n" -#: cmd_merging.cc:857 +#: cmd_merging.cc:838 #, fuzzy, c-format msgid "branch '%s' is currently unmerged:" msgstr "ブランチ '%s' は現在未統合です:\n" -#: cmd_merging.cc:864 -msgid "REVID" -msgstr "REVID" - -#: cmd_merging.cc:865 +#: cmd_merging.cc:846 msgid "dump the roster associated with the given REVID" msgstr "指定の REVID について関連づけられた名簿をダンプ" -#: cmd_netsync.cc:40 +#: cmd_netsync.cc:43 #, fuzzy, c-format msgid "setting default server to %s" msgstr "デフォルトのサーバーを %s に設定\n" -#: cmd_netsync.cc:46 +#: cmd_netsync.cc:49 #, c-format msgid "no hostname given" msgstr "ホスト名を指定して下さい" -#: cmd_netsync.cc:48 +#: cmd_netsync.cc:51 #, c-format msgid "no server given and no default server set" msgstr "サーバが未指定であり、デフォルトのサーバーも設定されていません" -#: cmd_netsync.cc:59 cmd_netsync.cc:79 +#: cmd_netsync.cc:79 cmd_netsync.cc:101 #, c-format msgid "no branch pattern given" msgstr "ブランチ名を指定して下さい" -#: cmd_netsync.cc:67 +#: cmd_netsync.cc:88 #, fuzzy, c-format msgid "setting default branch include pattern to '%s'" msgstr "ブランチ名に含めるデフォルトパターンを '%s' に設定\n" -#: cmd_netsync.cc:73 +#: cmd_netsync.cc:95 #, fuzzy, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "ブランチ名に含めないデフォルトパターンを '%s' に設定\n" -#: cmd_netsync.cc:81 +#: cmd_netsync.cc:103 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "ブランチパターンが未指定、かつデフォルトパターンも設定されていません" -#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 msgid "network" msgstr "ネットワーク" -#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]" -#: cmd_netsync.cc:98 +#: cmd_netsync.cc:120 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) にプッシュ" -#: cmd_netsync.cc:113 +#: cmd_netsync.cc:133 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) から取り込み" -#: cmd_netsync.cc:120 +#: cmd_netsync.cc:141 #, fuzzy, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "匿名で取り込んでいます; 認証が必要な場合は -kKEYNAME を使って下さい\n" -#: cmd_netsync.cc:127 +#: cmd_netsync.cc:148 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) と同期" -#: cmd_netsync.cc:149 +#: cmd_netsync.cc:167 #, c-format msgid "pid file '%s' already exists" msgstr "PID ファイル '%s' は既に存在しています" -#: cmd_netsync.cc:151 +#: cmd_netsync.cc:169 #, fuzzy, c-format msgid "failed to create pid file '%s'" msgstr "オプションファイル '%s' の解析に失敗" -#: cmd_netsync.cc:173 +#: cmd_netsync.cc:191 msgid "PATTERN ..." msgstr "PATTERN..." -#: cmd_netsync.cc:174 +#: cmd_netsync.cc:192 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "PATTERNs で指定したブランチを接続クライアントに提供" -#: cmd_netsync.cc:189 +#: cmd_netsync.cc:208 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1120,7 +1216,7 @@ msgstr "" "パスフレーズをずっと保存しておきたいのなら権限が必要です。 (フック " "persist_phrase_ok() を参照)" -#: cmd_netsync.cc:195 +#: cmd_netsync.cc:214 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1201,71 +1297,82 @@ msgstr[1] "%d パケット読み込み" msgstr[0] "%d パケット読み込み" msgstr[1] "%d パケット読み込み" -#: cmd_ws_commit.cc:42 +#: cmd_ws_commit.cc:45 +#, fuzzy msgid "" "Enter a description of this change.\n" -"Lines beginning with `MTN:' are removed automatically.\n" +"Lines beginning with `MTN:' are removed automatically." msgstr "" "この変更の説明を入力して下さい\n" "'MTN:' で始まる行は自動的に削除されます\n" -#: cmd_ws_commit.cc:50 +#: cmd_ws_commit.cc:62 #, c-format msgid "edit of log message failed" msgstr "ログメッセージの編集に失敗しました" -#: cmd_ws_commit.cc:54 +#: cmd_ws_commit.cc:67 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "ファイル、ディレクトリまたは完全なワークスペース (\".\") の変更を破棄" -#: cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:75 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "" -#: cmd_ws_commit.cc:81 +#: cmd_ws_commit.cc:95 #, fuzzy, c-format msgid "no missing files to revert" msgstr "みつからないファイル: %d\n" -#: cmd_ws_commit.cc:135 +#: cmd_ws_commit.cc:150 #, c-format msgid "reverting %s" msgstr "%s を戻しています" -#: cmd_ws_commit.cc:139 +#: cmd_ws_commit.cc:154 #, c-format msgid "no file version %s found in database for %s" msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" -#: cmd_ws_commit.cc:152 +#: cmd_ws_commit.cc:167 #, c-format msgid "recreating %s/" msgstr "%s/ を戻しています" -#: cmd_ws_commit.cc:170 +#: cmd_ws_commit.cc:190 msgid "disapprove of a particular revision" msgstr "特定のリビジョンを非承認" -#: cmd_ws_commit.cc:183 -#, c-format -msgid "revision '%s' has %d changesets, cannot invert\n" +#: cmd_ws_commit.cc:206 +#, fuzzy, c-format +msgid "revision %s has %d changesets, cannot invert" msgstr "リビジョン '%s' には %d 個の変更セットがあり、反転できません\n" -#: cmd_ws_commit.cc:187 +#: cmd_ws_commit.cc:210 #, c-format msgid "need --branch argument for disapproval" msgstr "非承認とするには --branch 引数が必要です" -#: cmd_ws_commit.cc:223 +#: cmd_ws_commit.cc:253 msgid "add files to workspace" msgstr "ファイルをワークスペースに追加" -#: cmd_ws_commit.cc:251 +#: cmd_ws_commit.cc:260 +#, c-format +msgid "cannot set '--unknown' and '--recursive' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:262 +#, c-format +msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:294 msgid "drop files from workspace" msgstr "ファイルをワークスペースから削除" -#: cmd_ws_commit.cc:285 +#: cmd_ws_commit.cc:330 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1273,15 +1380,15 @@ msgstr "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" -#: cmd_ws_commit.cc:287 +#: cmd_ws_commit.cc:332 msgid "rename entries in the workspace" msgstr "ワークスペース内のエントリの名称を変更" -#: cmd_ws_commit.cc:309 +#: cmd_ws_commit.cc:354 msgid "NEW_ROOT PUT_OLD" msgstr "NEW_ROOT PUT_OLD" -#: cmd_ws_commit.cc:310 +#: cmd_ws_commit.cc:355 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1294,16 +1401,53 @@ msgstr "" "ディレクトリと、PUT_OLD という名前の現在のルートディレクトリを指定します。\n" "--execute の使用を強く推奨します。" -#: cmd_ws_commit.cc:329 +#: cmd_ws_commit.cc:373 msgid "show status of workspace" msgstr "ワークスペースの状態を表示" -#: cmd_ws_commit.cc:392 -msgid "[DIRECTORY]\n" -msgstr "[DIRECTORY]\n" +#: cmd_ws_commit.cc:402 +#, fuzzy, c-format +msgid "Current branch: %s" +msgstr "ブランチ '%s' についてコミット開始\n" -#: cmd_ws_commit.cc:393 +#: cmd_ws_commit.cc:408 +#, c-format +msgid "Changes against parent %s" +msgstr "" + +#: cmd_ws_commit.cc:413 +#, fuzzy, c-format +msgid " no changes" +msgstr "変更なし" + +#: cmd_ws_commit.cc:417 +#, fuzzy, c-format +msgid " dropped %s" +msgstr "%s を破棄しています" + +#: cmd_ws_commit.cc:422 +#, fuzzy, c-format msgid "" +" renamed %s\n" +" to %s" +msgstr "%s から %s に名称変更しています" + +#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 +#, c-format +msgid " added %s" +msgstr "" + +#: cmd_ws_commit.cc:435 +#, c-format +msgid " patched %s" +msgstr "" + +#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +msgid "[DIRECTORY]" +msgstr "[DIRECTORY]" + +#: cmd_ws_commit.cc:440 +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" "Otherwise, it will be the head of the branch (given or implicit).\n" @@ -1315,42 +1459,47 @@ msgstr "" "取り出します。ディレクトリが未指定ならディレクトリ名として\n" "ブランチ名を使います" -#: cmd_ws_commit.cc:413 cmd_ws_commit.cc:432 +#: cmd_ws_commit.cc:458 #, c-format -msgid "need --branch argument for branch-based checkout" -msgstr "ブランチを基準にしたチェックアウトには --branch 引数が必要です" +msgid "use --revision or --branch to specify what to checkout" +msgstr "" -#: cmd_ws_commit.cc:426 +#: cmd_ws_commit.cc:466 #, c-format -msgid "checkout directory '%s' already exists" -msgstr "取り出すディレクトリ '%s' は既に存在しています" - -#: cmd_ws_commit.cc:440 -#, c-format msgid "branch %s has multiple heads:" msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています:" -#: cmd_ws_commit.cc:443 +#: cmd_ws_commit.cc:469 #, c-format msgid "choose one with '%s checkout -r'" msgstr "'%s update -r' で一つを選択して下さい" -#: cmd_ws_commit.cc:444 +#: cmd_ws_commit.cc:470 #, c-format msgid "branch %s has multiple heads" msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています" -#: cmd_ws_commit.cc:471 +#: cmd_ws_commit.cc:497 #, fuzzy, c-format msgid "revision %s is not a member of branch %s" msgstr "リビジョン %s はブランチ %s には属していません\n" -#: cmd_ws_commit.cc:504 +#: cmd_ws_commit.cc:514 #, c-format +msgid "you must specify a destination directory" +msgstr "" + +#: cmd_ws_commit.cc:527 +#, c-format +msgid "checkout directory '%s' already exists" +msgstr "取り出すディレクトリ '%s' は既に存在しています" + +#: cmd_ws_commit.cc:561 +#, c-format msgid "no file %s found in database for %s" msgstr "ファイル %s (対象 %s)はデータベース内にはみつかりません" -#: cmd_ws_commit.cc:522 +#: cmd_ws_commit.cc:579 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1360,45 +1509,45 @@ msgstr "" "get PATH [ATTR]\n" "drop PATH [ATTR]" -#: cmd_ws_commit.cc:523 +#: cmd_ws_commit.cc:580 msgid "set, get or drop file attributes" msgstr "ファイル属性を設定/取得/削除" -#: cmd_ws_commit.cc:540 +#: cmd_ws_commit.cc:597 #, c-format msgid "Unknown path '%s'" msgstr "不明なパス '%s'" -#: cmd_ws_commit.cc:569 -#, c-format -msgid "Path '%s' does not have attribute '%s'\n" +#: cmd_ws_commit.cc:626 +#, fuzzy, c-format +msgid "Path '%s' does not have attribute '%s'" msgstr "パス '%s' には属性 '%s' がありません\n" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:656 #, c-format msgid "No attributes for '%s'" msgstr "'%s' について属性はありません" -#: cmd_ws_commit.cc:608 +#: cmd_ws_commit.cc:667 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "パス '%s' について '%s' という属性はありません" -#: cmd_ws_commit.cc:621 +#: cmd_ws_commit.cc:680 msgid "commit workspace to database" msgstr "ワークスペースをデータベースにコミット" -#: cmd_ws_commit.cc:656 +#: cmd_ws_commit.cc:711 #, fuzzy, c-format msgid "no changes to commit" msgstr "コミットする変更がありません\n" -#: cmd_ws_commit.cc:670 +#: cmd_ws_commit.cc:731 #, fuzzy, c-format msgid "beginning commit on branch '%s'" msgstr "ブランチ '%s' についてコミット開始\n" -#: cmd_ws_commit.cc:679 +#: cmd_ws_commit.cc:740 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1409,37 +1558,37 @@ msgstr "" "_MTN/log を移動/削除するか、コマンド行から --message/--message-file を\n" "消して下さい。" -#: cmd_ws_commit.cc:694 +#: cmd_ws_commit.cc:755 #, c-format msgid "empty log message; commit canceled" msgstr "空のログメッセージ; コミットは取り消されました" -#: cmd_ws_commit.cc:715 +#: cmd_ws_commit.cc:777 #, fuzzy, c-format -msgid "log message rejected: %s" +msgid "log message rejected by hook: %s" msgstr "ログメッセージを拒否: %s\n" -#: cmd_ws_commit.cc:723 +#: cmd_ws_commit.cc:785 #, fuzzy, c-format msgid "revision %s already in database" msgstr "リビジョン %s は既にデータベース内に存在しています\n" -#: cmd_ws_commit.cc:762 cmd_ws_commit.cc:792 +#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "ファイル '%s' は commit 前に変更されました. 中止します" -#: cmd_ws_commit.cc:774 +#: cmd_ws_commit.cc:836 #, fuzzy, c-format -msgid "Your database is missing version %1% of file '%2%'" +msgid "Your database is missing version %s of file '%s'" msgstr "ファイル %s 内のデータベースバージョンを検出できませんでした" -#: cmd_ws_commit.cc:820 +#: cmd_ws_commit.cc:886 #, fuzzy, c-format msgid "committed revision %s" msgstr "リビジョン %s をコミット\n" -#: cmd_ws_commit.cc:826 +#: cmd_ws_commit.cc:892 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1448,70 +1597,72 @@ msgstr "" "注意: このリビジョンによって分岐が生じます\n" "注意: 分岐を望まないなら '%s merge' を実行して下さい" -#: cmd_ws_commit.cc:859 -msgid "[DIRECTORY]" -msgstr "[DIRECTORY]" - -#: cmd_ws_commit.cc:860 +#: cmd_ws_commit.cc:926 msgid "setup a new workspace directory, default to current" msgstr "新しいワークスペースディレクトリを作成 (デフォルト: 現在の場所)" -#: cmd_ws_commit.cc:866 +#: cmd_ws_commit.cc:932 #, c-format msgid "need --branch argument for setup" msgstr "作成には --branch 引数が必要です" -#: cmd_ws_commit.cc:881 +#: cmd_ws_commit.cc:949 +msgid "" +"migrate a workspace directory's metadata to the latest format; defaults to " +"the current workspace" +msgstr "" + +#: cmd_ws_commit.cc:962 msgid "refresh the inodeprint cache" msgstr "i-node 表示キャッシュを更新" -#: commands.cc:125 commands.cc:227 +#: commands.cc:139 commands.cc:241 #, fuzzy, c-format msgid "unknown command '%s'" msgstr "不明なコマンド '%s'\n" -#: commands.cc:136 -#, c-format -msgid "command '%s' has multiple ambiguous expansions:\n" +#: commands.cc:150 +#, fuzzy, c-format +msgid "command '%s' has multiple ambiguous expansions:" msgstr "'%s' だけでは曖昧で、展開できるコマンド候補は複数あります:\n" -#: commands.cc:169 +#: commands.cc:183 msgid "commands:" msgstr "コマンド:" -#: commands.cc:248 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "command [ARGS...]" -#: commands.cc:248 +#: commands.cc:276 msgid "display command help" msgstr "コマンドヘルプを表示" -#: commands.cc:400 +#: commands.cc:420 #, fuzzy, c-format msgid "expanding selection '%s'" msgstr "セレクション '%s' を展開\n" -#: commands.cc:408 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "セレクション '%s' に一致するものがありません" -#: commands.cc:414 +#: commands.cc:434 #, fuzzy, c-format msgid "expanded to '%s'" msgstr "'%s' に展開\n" -#: commands.cc:431 -#, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" +#: commands.cc:451 +#, fuzzy, c-format +msgid "selection '%s' has multiple ambiguous expansions:" msgstr "'%s' だけでは曖昧で、展開できるセレクションの候補は複数あります: \n" -#: commands.cc:448 +#: commands.cc:468 msgid "note: " msgstr "ノート: " -#: commands.cc:449 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1520,81 +1671,79 @@ msgstr "" "ブランチ '%s' には複数の最新版 (HEAD) があります\n" "’%s merge' を実行した方がよいでしょう" -#: commands.cc:467 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message と --message-file を同時に指定することはできません" -#: database_check.cc:133 +#: database_check.cc:137 #, c-format msgid "file structure is corrupted; cannot check further" msgstr "" -#: database_check.cc:144 +#: database_check.cc:148 msgid "files" msgstr "ファイル" -#: database_check.cc:173 +#: database_check.cc:177 msgid "rosters" msgstr "名簿" -#: database_check.cc:240 +#: database_check.cc:235 msgid "markings" msgstr "印" -#: database_check.cc:338 netsync.cc:2967 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 msgid "revisions" msgstr "リビジョン" -#: database_check.cc:437 +#: database_check.cc:401 msgid "ancestry" msgstr "祖先" -#: database_check.cc:470 netsync.cc:2971 +#: database_check.cc:434 netsync.cc:2973 msgid "keys" msgstr "鍵" -#: database_check.cc:496 +#: database_check.cc:460 msgid "certs" msgstr "証明" -#: database_check.cc:533 +#: database_check.cc:504 +msgid "heights" +msgstr "" + +#: database_check.cc:548 +msgid "height relations" +msgstr "" + +#: database_check.cc:594 #, fuzzy, c-format msgid "file %s missing (%d manifest references)" msgstr "ファイル %s がありません (マニフェスト参照: %d)\n" -#: database_check.cc:540 +#: database_check.cc:601 #, fuzzy, c-format msgid "file %s unreferenced" msgstr "ファイル %s は参照されていません\n" -#: database_check.cc:561 +#: database_check.cc:620 #, fuzzy, c-format msgid "roster %s unreferenced" msgstr "名簿 %s は参照されていません\n" -#: database_check.cc:567 +#: database_check.cc:626 #, fuzzy, c-format msgid "roster %s incomplete (%d missing files)" msgstr "名簿 %s は不完全です (みつからないファイル: %d)\n" -#: database_check.cc:574 +#: database_check.cc:633 #, fuzzy, c-format msgid "roster %s incomplete (%d missing revisions)" msgstr "名簿 %s は不完全です (みつからないリビジョン: %d)\n" -#: database_check.cc:581 +#: database_check.cc:658 #, fuzzy, c-format -msgid "roster %s is not parseable (perhaps with unnormalized paths?)" -msgstr "名簿 %s を解析できません (パスが正規化されていないのでは?)\n" - -#: database_check.cc:588 -#, fuzzy, c-format -msgid "roster %s is not in normalized form" -msgstr "名簿 %s は正規化された形式になっていません\n" - -#: database_check.cc:613 -#, fuzzy, c-format msgid "" "revision %s missing (%d revision references; %d cert references; %d parent " "references; %d child references; %d roster references)" @@ -1602,214 +1751,226 @@ msgstr "" "リビジョン %s がありません (リビジョン参照: %d, 証明参照: %d, 親参照: %d, 子" "参照: %d, 名簿参照: %d)\n" -#: database_check.cc:621 +#: database_check.cc:666 #, fuzzy, c-format msgid "revision %s incomplete (%d missing manifests)" msgstr "リビジョン %s は不完全です (みつからないマニフェスト: %d)\n" -#: database_check.cc:628 +#: database_check.cc:673 #, fuzzy, c-format msgid "revision %s incomplete (%d missing revisions)" msgstr "リビジョン %s は不完全です (みつからないリビジョン: %d)\n" -#: database_check.cc:635 +#: database_check.cc:680 #, fuzzy, c-format -msgid "revision %s incomplete (missing roster link)" -msgstr "リビジョン %s は不完全です (名簿のリンクがありません)\n" - -#: database_check.cc:641 -#, fuzzy, c-format msgid "revision %s incomplete (missing roster)" msgstr "リビジョン %s は不完全です (名簿がありません)\n" -#: database_check.cc:647 +#: database_check.cc:686 #, fuzzy, c-format msgid "revision %s mismatched roster and manifest" msgstr "リビジョン %s の名簿とマニフェストが一致していません\n" -#: database_check.cc:653 +#: database_check.cc:692 #, fuzzy, c-format msgid "revision %s incomplete (incomplete roster)" msgstr "リビジョン %s は不完全です (名簿が不完全)\n" -#: database_check.cc:659 +#: database_check.cc:698 #, fuzzy, c-format msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)" msgstr "リビジョン %s は親と不一致です (親: %d; リビジョン参照: %d)\n" -#: database_check.cc:668 +#: database_check.cc:707 #, fuzzy, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)" msgstr "リビジョン %s は子と不一致です (子: %d; 親: %d)\n" -#: database_check.cc:680 +#: database_check.cc:719 #, fuzzy, c-format msgid "revision %s has bad history (%s)" msgstr "リビジョン %s は不正な履歴 (%s) を持っています\n" -#: database_check.cc:687 +#: database_check.cc:726 #, fuzzy, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)" msgstr "リビジョン %s を解析できません (パスが正規化されていないのでは?)\n" -#: database_check.cc:694 +#: database_check.cc:733 #, fuzzy, c-format msgid "revision %s is not in normalized form" msgstr "リビジョン %s は正規化された形式ではありません\n" -#: database_check.cc:718 +#: database_check.cc:757 #, fuzzy, c-format msgid "key %s missing (signed %d certs)" msgstr "鍵 %s がありません (%d 個の証明を署名)\n" -#: database_check.cc:751 +#: database_check.cc:790 #, fuzzy, c-format msgid "revision %s unchecked signature in %s cert from missing key %s" msgstr "" "リビジョン %s の %s 証明(失われた鍵 %s) の署名は検証されたものではありませ" "ん\n" -#: database_check.cc:759 +#: database_check.cc:798 #, fuzzy, c-format msgid "revision %s bad signature in %s cert from key %s" msgstr "リビジョン %s の %s 証明 (鍵 %s) の不正な署名を無視します\n" -#: database_check.cc:774 +#: database_check.cc:813 #, fuzzy, c-format -msgid "revision %1% missing %2% cert" +msgid "revision %s missing %s cert" msgstr "リビジョン %s は %s 証明を欠いています\n" -#: database_check.cc:783 +#: database_check.cc:822 #, fuzzy, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)" msgstr "リビジョン %s は証明に合致しません (%d 作者 %d 日時 %d 変更ログ)\n" -#: database_check.cc:870 +#: database_check.cc:846 #, fuzzy, c-format +msgid "height missing for revision %s" +msgstr "みつからないリビジョン: %d\n" + +#: database_check.cc:853 +#, fuzzy, c-format +msgid "duplicate height for revision %s" +msgstr "基準リビジョン %s に更新\n" + +#: database_check.cc:859 +#, c-format +msgid "height of revision %s not greater than that of parent" +msgstr "" + +#: database_check.cc:944 +#, fuzzy, c-format msgid "%d missing files" msgstr "みつからないファイル: %d\n" -#: database_check.cc:872 +#: database_check.cc:946 #, fuzzy, c-format msgid "%d unreferenced files" msgstr "参照されていないファイル: %d\n" -#: database_check.cc:875 +#: database_check.cc:949 #, fuzzy, c-format msgid "%d unreferenced rosters" msgstr "参照されていない名簿: %d\n" -#: database_check.cc:877 +#: database_check.cc:951 #, fuzzy, c-format msgid "%d incomplete rosters" msgstr "不完全な名簿: %d\n" -#: database_check.cc:879 +#: database_check.cc:954 #, fuzzy, c-format -msgid "%d rosters not parseable (perhaps with invalid paths)" -msgstr "解析できない名簿 (パスが不適切なのでは?): %d\n" - -#: database_check.cc:882 -#, fuzzy, c-format -msgid "%d rosters not in normalized form" -msgstr "正規化された形式になっていない名簿: %d\n" - -#: database_check.cc:885 -#, fuzzy, c-format msgid "%d missing revisions" msgstr "みつからないリビジョン: %d\n" -#: database_check.cc:887 +#: database_check.cc:956 #, fuzzy, c-format msgid "%d incomplete revisions" msgstr "不完全なリビジョン: %d\n" -#: database_check.cc:889 +#: database_check.cc:958 #, fuzzy, c-format msgid "%d mismatched parents" msgstr "一致しない親: %d\n" -#: database_check.cc:891 +#: database_check.cc:960 #, fuzzy, c-format msgid "%d mismatched children" msgstr "一致しない子: %d\n" -#: database_check.cc:893 +#: database_check.cc:962 #, fuzzy, c-format msgid "%d revisions with bad history" msgstr "不正な履歴を持つリビジョン: %d\n" -#: database_check.cc:895 +#: database_check.cc:964 #, fuzzy, c-format msgid "%d revisions not parseable (perhaps with invalid paths)" msgstr "解析できないリビジョン (パスが不適切なのでは?): %d\n" -#: database_check.cc:898 +#: database_check.cc:967 #, fuzzy, c-format msgid "%d revisions not in normalized form" msgstr "正規化された形式になっていないリビジョン: %d\n" -#: database_check.cc:902 +#: database_check.cc:971 #, fuzzy, c-format -msgid "%d unreferenced roster links" -msgstr "参照されていない名簿リンク: %d\n" - -#: database_check.cc:905 -#, fuzzy, c-format msgid "%d missing rosters" msgstr "みつからない名簿: %d\n" -#: database_check.cc:909 +#: database_check.cc:975 #, fuzzy, c-format msgid "%d missing keys" msgstr "みつからない鍵: %d\n" -#: database_check.cc:912 +#: database_check.cc:978 #, fuzzy, c-format msgid "%d missing certs" msgstr "みつからない証明: %d\n" -#: database_check.cc:914 +#: database_check.cc:980 #, fuzzy, c-format msgid "%d mismatched certs" msgstr "一致しない証明: %d\n" -#: database_check.cc:916 +#: database_check.cc:982 #, fuzzy, c-format msgid "%d unchecked signatures due to missing keys" msgstr "鍵がみつからないために検証されていない署名: %d\n" -#: database_check.cc:918 +#: database_check.cc:984 #, fuzzy, c-format msgid "%d bad signatures" msgstr "不正な署名: %d\n" -#: database_check.cc:944 +#: database_check.cc:987 #, fuzzy, c-format -msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs" +msgid "%d missing heights" +msgstr "みつからない証明: %d\n" + +#: database_check.cc:989 +#, c-format +msgid "%d duplicate heights" +msgstr "" + +#: database_check.cc:991 +#, fuzzy, c-format +msgid "%d incorrect heights" +msgstr "不完全なリビジョン: %d\n" + +#: database_check.cc:1017 +#, fuzzy, c-format +msgid "" +"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d " +"heights" msgstr "検証完了: ファイル: %d, 名簿: %d, リビジョン: %d, 鍵: %d, 証明: %d\n" -#: database_check.cc:950 +#: database_check.cc:1024 #, fuzzy, c-format msgid "total problems detected: %d (%d serious)" msgstr "検出した障害総計: %d (深刻: %d)\n" -#: database_check.cc:952 +#: database_check.cc:1026 #, c-format msgid "serious problems detected" msgstr "深刻な問題を検出しました" -#: database_check.cc:954 +#: database_check.cc:1028 #, fuzzy, c-format msgid "minor problems detected" msgstr "軽微な問題を検出しました\n" -#: database_check.cc:956 +#: database_check.cc:1030 #, fuzzy, c-format msgid "database is good" msgstr "データベースは正常です\n" -#: database.cc:156 +#: database.cc:159 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -1822,15 +1983,15 @@ msgstr "" "'%s db migrate' として更新してみて下さい\n" "(これは不可逆ですので、まずバックアップをとった方がいいでしょう)" -#: database.cc:170 +#: database.cc:173 #, c-format msgid "this database already contains rosters" msgstr "このデータベースには既に名簿が含まれています" -#: database.cc:190 -#, c-format +#: database.cc:200 +#, fuzzy, c-format msgid "" -"database %s contains revisions but no rosters\n" +"database %s contains old-style revisions\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" @@ -1845,7 +2006,7 @@ msgstr "" "統合し、新しいデータベースに取り込むのを待って下さい。\n" "不便ですみません。" -#: database.cc:209 +#: database.cc:210 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -1856,19 +2017,26 @@ msgstr "" "このデータベースは古すぎるのでアップグレードする必要があります\n" "詳細については README.changesets を参照して下さい" -#: database.cc:245 +#: database.cc:221 #, c-format +msgid "" +"database %s misses some cached data\n" +"run '%s db regenerate_caches' to restore use of this database" +msgstr "" + +#: database.cc:259 +#, c-format msgid "unable to probe database version in file %s" msgstr "ファイル %s 内のデータベースバージョンを検出できませんでした" -#: database.cc:252 +#: database.cc:266 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" "データベース %s は SQLite ver. 3 のファイルではありません。ダンプした後再度読" "み込んでみて下さい" -#: database.cc:281 schema_migration.cc:200 +#: database.cc:293 schema_migration.cc:201 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -1876,7 +2044,7 @@ msgstr "" "データベースとそれを含むディレクトリが書き込み可能であるか、\n" "そしてディスク容量が不足していないか確認して下さい" -#: database.cc:287 schema_migration.cc:205 +#: database.cc:297 schema_migration.cc:206 #, c-format msgid "" "sqlite error: %s\n" @@ -1885,12 +2053,12 @@ msgstr "" "sqlite エラー: %s\n" "%s" -#: database.cc:332 +#: database.cc:342 #, c-format msgid "could not initialize database: %s: already exists" msgstr "データベースを初期化できませんでした: %s: 既に存在しています" -#: database.cc:337 +#: database.cc:347 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -1901,12 +2069,12 @@ msgstr "" "じ幹を持っています\n" "データベース作成を中止します" -#: database.cc:487 +#: database.cc:497 #, c-format msgid "cannot create %s; it already exists" msgstr "%s を作成できません; 既に存在しています" -#: database.cc:564 +#: database.cc:574 #, fuzzy, c-format msgid "" "schema version : %s\n" @@ -1927,10 +2095,11 @@ msgid "" " revisions : %u\n" " cached ancestry : %u\n" " certs : %u\n" +" heights : %u\n" " total : %u\n" "database:\n" " page size : %u\n" -" cache size : %u\n" +" cache size : %u" msgstr "" "スキーマバージョン : %s\n" "個数:\n" @@ -1954,80 +2123,80 @@ msgstr "" " ページサイズ : %u\n" " キャッシュサイズ : %u\n" -#: database.cc:626 +#: database.cc:639 #, c-format msgid "database schema version: %s" msgstr "基準スキーマバージョン: %s" -#: database.cc:703 -#, c-format -msgid "multiple statements in query: %s\n" +#: database.cc:716 +#, fuzzy, c-format +msgid "multiple statements in query: %s" msgstr "クエリ中に複数のステートメント: %s\n" -#: database.cc:709 +#: database.cc:722 #, fuzzy, c-format msgid "wanted %d columns got %d in query: %s" msgstr "クエリで %d 列要求しましたが得たのは %d 列です: %s\n" -#: database.cc:768 +#: database.cc:788 #, fuzzy, c-format msgid "null result in query: %s" msgstr "クエリ中に結果 null が含まれています: %s\n" -#: database.cc:786 +#: database.cc:806 #, fuzzy, c-format msgid "wanted %d rows got %d in query: %s" msgstr "クエリで %d 行要求しましたが得たのは %s です: %s\n" -#: database.cc:1926 +#: database.cc:2040 #, c-format msgid "another key with name '%s' already exists" msgstr "'%s' という名前の他の鍵が既に存在しています" -#: database.cc:2958 +#: database.cc:3037 #, c-format msgid "no database specified" msgstr "データベース未指定" -#: database.cc:2966 +#: database.cc:3045 #, c-format msgid "database %s does not exist" msgstr "データベース %s は存在しません" -#: database.cc:2967 +#: database.cc:3046 #, c-format msgid "%s is a directory, not a database" msgstr "%s はデータベースではなくディレクトリです" -#: database.cc:2992 +#: database.cc:3071 #, c-format msgid "could not open database '%s': %s" msgstr "データベース '%s': %s を開けませんでした" -#: diff_patch.cc:608 +#: diff_patch.cc:614 #, c-format msgid "file '%s' does not exist in workspace" msgstr "ファイル '%s' はワークスペース内に存在しません" -#: diff_patch.cc:609 +#: diff_patch.cc:615 #, c-format msgid "'%s' in workspace is a directory, not a file" msgstr "ワークスペース内の '%s' はファイルではなくディレクトリです" -#: diff_patch.cc:613 +#: diff_patch.cc:619 #, c-format msgid "file %s in workspace has id %s, wanted %s" msgstr "" "ワークスペース内のファイル %s の ID は %s ですが、期待されるのは %s です" -#: diff_patch.cc:734 -#, c-format +#: diff_patch.cc:744 +#, fuzzy, c-format msgid "" "help required for 3-way merge\n" "[ancestor] %s\n" "[ left] %s\n" "[ right] %s\n" -"[ merged] %s\n" +"[ merged] %s" msgstr "" "三元統合には手助けが必要です\n" "[ 祖先] %s\n" @@ -2172,47 +2341,47 @@ msgstr "%s についてファイルパ゠msgid "caught runtime error %s constructing file path for %s" msgstr "%s についてファイルパス作成中に実行時エラー %s 発生\n" -#: file_io.cc:530 +#: file_io.cc:530 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "そのようなファイルまたはディレクトリはありません: '%s'" -#: keys.cc:99 +#: keys.cc:102 #, c-format msgid "got empty passphrase from get_passphrase() hook" msgstr "get_passphrase() フックは空のパスフレーズを返しました" -#: keys.cc:115 +#: keys.cc:118 #, c-format msgid "empty passphrase not allowed" msgstr "パスフレーズは空にできません" -#: keys.cc:122 +#: keys.cc:125 #, c-format msgid "confirm passphrase for key ID [%s]: " msgstr "鍵 ID [%s] のパスフレーズを確認: " -#: keys.cc:127 +#: keys.cc:130 #, fuzzy, c-format msgid "empty passphrases not allowed, try again" msgstr "パスフレーズは空にできません. 再度試して下さい\n" -#: keys.cc:128 keys.cc:135 +#: keys.cc:131 keys.cc:138 #, fuzzy, c-format msgid "too many failed passphrases" msgstr "パスフレーズの入力ミスが多すぎます\n" -#: keys.cc:134 +#: keys.cc:137 #, fuzzy, c-format msgid "passphrases do not match, try again" msgstr "パスフレーズが一致しません。再度試して下さい\n" -#: keys.cc:141 +#: keys.cc:144 #, c-format msgid "no passphrase given" msgstr "パスフレーズを指定して下さい" -#: keys.cc:564 +#: keys.cc:570 #, c-format msgid "passphrase for '%s' is incorrect" msgstr "'%s' に対するパスフレーズが間違っています" @@ -2227,7 +2396,7 @@ msgstr "ディレクトリ '%s' ã¯å­˜åœ msgid "Directory '%s' does not exist" msgstr "ディレクトリ '%s' は存在しません" -#: lua.cc:480 rcs_import.cc:1235 work.cc:480 +#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "'%s' はディレクトリではありません" @@ -2237,13 +2406,15 @@ msgstr "初期化ファイル '%s' ã‚’èª msgid "lua error while loading rcfile '%s'" msgstr "初期化ファイル '%s' を読み込み中に lua のエラー" -#: main.cc:326 -msgid "interrupted" -msgstr "割込み" +#: merge.cc:60 +#, c-format +msgid "resolve non-content conflicts and then try again." +msgstr "" -#: main.cc:330 -msgid "terminated by signal" -msgstr "シグナルで終了" +#: merge.cc:124 +#, c-format +msgid "merge failed due to unresolved conflicts" +msgstr "" #: merkle_tree.cc:290 #, c-format @@ -2255,235 +2426,13 @@ msgstr "一致しないノードハッ゠msgid "mismatched node hash value %s, expected %s" msgstr "一致しないノードハッシュ値 %s、期待されるのは %s です" -#: monotone.cc:65 -msgid "select branch cert for operation" -msgstr "操作のためのブランチ証明を選択" - -#: monotone.cc:66 -msgid "select revision id for operation" -msgstr "操作のためのリビジョン ID を選択" - -#: monotone.cc:67 -msgid "set commit changelog message" -msgstr "コミット変更記録メッセージを設定" - -#: monotone.cc:68 -msgid "set filename containing commit changelog message" -msgstr "コミット変更記録メッセージを含むファイルを設定" - -#: monotone.cc:69 -msgid "override date/time for commit" -msgstr "コミット時の日時を上書き指定" - -#: monotone.cc:70 -msgid "override author for commit" -msgstr "コミット時の作成者を上書き指定" - -#: monotone.cc:71 -msgid "limit the number of levels of directories to descend" -msgstr "降下するディレクトリの深さを制限" - -#: monotone.cc:72 -msgid "limit log output to the last number of entries" -msgstr "ログ出力のエントリ数(最近)を制限" - -#: monotone.cc:73 -msgid "limit log output to the next number of entries" -msgstr "ログ出力のエントリ数(次)を制限" - -#: monotone.cc:74 -msgid "record process id of server" -msgstr "サーバーのプロセス ID を記録" - -#: monotone.cc:75 -msgid "print a brief version of the normal output" -msgstr "通常出力の簡単なバージョンを表示" - -#: monotone.cc:76 -msgid "print diffs along with logs" -msgstr "ログと共に差分を表示" - -#: monotone.cc:77 -msgid "exclude merges when printing logs" -msgstr "ログを表示する際に統合については省略" - -#: monotone.cc:78 -msgid "use the current arguments as the future default" -msgstr "現在の引数を将来のデフォルトとして使用" - -#: monotone.cc:79 -msgid "leave out anything described by its argument" -msgstr "引数によって説明されるすべてを省く" - -#: monotone.cc:80 -msgid "use unified diff format" -msgstr "unified diff 形式を使用" - -#: monotone.cc:81 -msgid "use context diff format" -msgstr "context diff 形式を使用" - -#: monotone.cc:82 -msgid "use external diff hook for generating diffs" -msgstr "差分の生成に外部 diff フックを使用" - -#: monotone.cc:83 -msgid "argument to pass external diff hook" -msgstr "外部 diff フックに渡す引数" - -#: monotone.cc:84 -msgid "do not show the function containing each block of changes" -msgstr "" - -#: monotone.cc:85 -msgid "another name for --no-show-encloser (for compatibility with GNU diff)" -msgstr "" - -#: monotone.cc:86 -msgid "perform the associated file operation" -msgstr "関連付けられたファイル操作を実行" - -#: monotone.cc:87 -msgid "address:port to listen on (default :4691)" -msgstr "待機する アドレス:ポート (デフォルト: 4691)" - -#: monotone.cc:88 -msgid "perform the operations for files missing from workspace" -msgstr "ワークスペース内ではみつからないファイルについて操作を実行" - -#: monotone.cc:89 -msgid "perform the operations for unknown files from workspace" -msgstr "ワークスペース内では不明なファイルについて操作を実行" - -#: monotone.cc:90 -msgid "push the specified key even if it hasn't signed anything" -msgstr "指定の鍵について署名の有無にかかわらず取り込み" - -#: monotone.cc:91 -msgid "serve netsync on stdio" -msgstr "" - -#: monotone.cc:92 -msgid "disable transport authentication" -msgstr "" - -#: monotone.cc:93 -msgid "when rosterifying, drop attrs entries with the given key" -msgstr "名簿作成中に指定の鍵のエントリの属性を破棄" - -#: monotone.cc:94 -msgid "exclude files when printing logs" -msgstr "ログを表示する際にファイルについては省略" - -#: monotone.cc:95 -msgid "also operate on the contents of any listed directories" -msgstr "一覧のディレクトリの内容についても処理" - -#: monotone.cc:104 -msgid "print debug log to stderr while running" -msgstr "実行時、標準エラー出力にデバッグログを表示" - -#: monotone.cc:105 -msgid "file to dump debugging log to, on failure" -msgstr "失敗時にデバッグログを出力するファイル" - -#: monotone.cc:106 -msgid "file to write the log to" -msgstr "ログを書き込むファイル" - -#: monotone.cc:107 -#, fuzzy -msgid "suppress verbose, informational and progress messages" -msgstr "ログおよび進捗を示すメッセージを表示しない" - -#: monotone.cc:108 -#, fuzzy -msgid "suppress warning, verbose, informational and progress messages" -msgstr "ログおよび進捗を示すメッセージを表示しない" - -#: monotone.cc:109 -msgid "display help message" -msgstr "ヘルプメッセージを表示" - -#: monotone.cc:110 -msgid "print version number, then exit" -msgstr "バージョン番号を表示し、終了" - -#: monotone.cc:111 -msgid "print detailed version number, then exit" -msgstr "詳細なバージョン番号を表示し、終了" - -#: monotone.cc:112 -msgid "insert command line arguments taken from the given file" -msgstr "指定のファイルの内容をコマンド行引数に挿入" - -#: monotone.cc:113 -msgid "set ticker style (count|dot|none)" -msgstr "ティッカーのスタイルを設定 (count|dot|none)" - -#: monotone.cc:114 -msgid "do not load standard lua hooks" -msgstr "標準 lua フックを読み込まない" - -#: monotone.cc:115 -msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" -msgstr "" -"~/.monotone/monotonerc または _MTN/monotonerc lua ファイルを読み込まない" - -#: monotone.cc:116 -msgid "load extra rc file" -msgstr "別の初期化ファイルを読み込む" - -#: monotone.cc:117 -msgid "set key for signatures" -msgstr "署名の鍵を設定" - -#: monotone.cc:118 -msgid "set name of database" -msgstr "データベース名を設定" - -#: monotone.cc:119 -msgid "limit search for workspace to specified root" -msgstr "ワークスペースの検索を指定のルート下に制限" - -#: monotone.cc:120 -msgid "verbose completion output" -msgstr "冗長な完了メッセージ" - -#: monotone.cc:121 -msgid "set location of key store" -msgstr "鍵の保存場所を設定" - -#: monotone.cc:122 -msgid "set location of configuration directory" -msgstr "設定用のディレクトリの場所を設定" - -#: monotone.cc:226 -#, c-format -msgid "problem parsing arguments from file %s: %s" -msgstr "ファイル %s からの引数を解析中に問題発生: %s" - -#: monotone.cc:235 -#, c-format -msgid "weird error when stuffing arguments read from %s: %s\n" -msgstr "%s から引数を読み取り中に予期せぬエラー発生: %s\n" - -#: monotone.cc:331 -msgid "[OPTION...] command [ARGS...]\n" +#: monotone.cc:274 +#, fuzzy, c-format +msgid "Usage: %s [OPTION...] command [ARG...]" msgstr "[OPTION...] command [ARGS...]\n" -#: monotone.cc:600 +#: monotone.cc:282 #, c-format -msgid "syntax error near the \"%s\" option: %s" -msgstr "\"%s\" オプションの近くに構文エラー: %s" - -#: monotone.cc:639 -#, fuzzy, c-format -msgid "%s %s doesn't use the option %s" -msgstr "monotone %s にはオプション %s は使えません" - -#: monotone.cc:673 -#, c-format msgid "Options specific to '%s %s':" msgstr "'%s %s' に特化したオプション:" @@ -2545,10 +2494,10 @@ msgstr "'%d' バイトの長さ超過の msgstr "'%d' バイトの長さ超過のペイロード" #: netcmd.cc:176 -#, c-format +#, fuzzy, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" -"this suggests data was corrupted in transit\n" +"this suggests data was corrupted in transit" msgstr "" "不正な HMAC チェックサム (計算値 %s / 期待値 %s)\n" "これは転送中にデータが壊れたことを示唆しています\n" @@ -2649,11 +2598,11 @@ msgstr "サーバー鍵が変更されだmsgstr "サーバー鍵が変更されました" #: netsync.cc:1251 -#, c-format +#, fuzzy, c-format msgid "" "first time connecting to server %s\n" "I'll assume it's really them, but you might want to double-check\n" -"their key's fingerprint: %s\n" +"their key's fingerprint: %s" msgstr "" "サーバー %s に接続するのは初めてです\n" "偽物でないとは思いますが、鍵の指紋を二重にチェックしてみるといいでしょう: %" @@ -2769,212 +2718,439 @@ msgstr "こちらのデータベースだmsgid "%s with hash '%s' does not exist in our database" msgstr "こちらのデータベースにはハッシュ '%s' の epoch は含まれていません" -#: netsync.cc:1857 +#: netsync.cc:1859 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" "ブランチ %s について epoch が一致しません。サーバー側 '%s', クライアント側 '%" "s'" -#: netsync.cc:1875 +#: netsync.cc:1877 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "公開鍵 '%s' (%s) についてハッシュ検証に失敗。期待値 '%s'、計算値 '%s'" -#: netsync.cc:1889 +#: netsync.cc:1891 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "リビジョン証明 '%s' についてハッシュ検証に失敗" -#: netsync.cc:1951 +#: netsync.cc:1953 #, c-format msgid "Received warning from usher: %s" msgstr "門番から警告を受信: %s" -#: netsync.cc:2038 netsync.cc:2069 +#: netsync.cc:2040 netsync.cc:2071 msgid "source and sink" msgstr "ソースとシンク" -#: netsync.cc:2039 netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "source" msgstr "ソース" -#: netsync.cc:2039 netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "sink" msgstr "シンク" -#: netsync.cc:2226 -#, c-format -msgid "input buffer for peer %s is overfull after netcmd dispatch\n" +#: netsync.cc:2228 +#, fuzzy, c-format +msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "netcmd dispatch の後でピーア %s の入力バッファがあふれました\n" -#: netsync.cc:2238 netsync.cc:2337 +#: netsync.cc:2240 netsync.cc:2339 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生\n" -#: netsync.cc:2244 +#: netsync.cc:2246 #, fuzzy, c-format msgid "error: %s" msgstr "エラー: %s\n" -#: netsync.cc:2308 +#: netsync.cc:2310 #, fuzzy, c-format msgid "connecting to %s" msgstr "%s に接続中\n" -#: netsync.cc:2352 -#, c-format -msgid "timed out waiting for I/O with peer %s, disconnecting\n" +#: netsync.cc:2354 +#, fuzzy, c-format +msgid "timed out waiting for I/O with peer %s, disconnecting" msgstr "ピーア %s の I/O を待っている間にタイムアウト, 切断中\n" -#: netsync.cc:2375 -#, c-format -msgid "processing failure while talking to peer %s, disconnecting\n" +#: netsync.cc:2377 +#, fuzzy, c-format +msgid "processing failure while talking to peer %s, disconnecting" msgstr "ピーア %s と通信中に処理が失敗し、切断中\n" -#: netsync.cc:2392 +#: netsync.cc:2394 #, fuzzy, c-format msgid "successful exchange with %s" msgstr "%s との交換に成功\n" -#: netsync.cc:2398 +#: netsync.cc:2400 #, fuzzy, c-format msgid "peer %s disconnected after we informed them of error" msgstr "ピーア %s にエラーを報告後に切断されました\n" -#: netsync.cc:2403 -#, c-format -msgid "I/O failure while talking to peer %s, disconnecting\n" +#: netsync.cc:2405 +#, fuzzy, c-format +msgid "I/O failure while talking to peer %s, disconnecting" msgstr "ピーア %s と通信中に I/O の失敗、切断中\n" -#: netsync.cc:2469 +#: netsync.cc:2471 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生、誤りとして印付け\n" -#: netsync.cc:2501 +#: netsync.cc:2503 #, fuzzy, c-format msgid "accepted new client connection from %s : %s" msgstr "%s : %s からの新しいクライアント接続を受理\n" -#: netsync.cc:2538 +#: netsync.cc:2540 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" msgstr "ピーア %s: '%s' からを処理中にプロトコルエラー発生、切断中\n" -#: netsync.cc:2549 +#: netsync.cc:2551 #, fuzzy, c-format msgid "peer %s read failed in working state (error)" msgstr "ピーア %s についてワーキングステートで読み込みに失敗 (エラー)\n" -#: netsync.cc:2554 -#, c-format +#: netsync.cc:2556 +#, fuzzy, c-format msgid "" -"peer %s read failed in shutdown state (possibly client misreported error)\n" +"peer %s read failed in shutdown state (possibly client misreported error)" msgstr "" "ピーア %s についてシャットダウンステートで読み込みに失敗 (おそらくクライアン" "トの誤ったエラー報告です)\n" -#: netsync.cc:2560 +#: netsync.cc:2562 #, fuzzy, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "ピーア %s について確認ステートで読み込みに失敗 (成功)\n" -#: netsync.cc:2581 +#: netsync.cc:2583 #, fuzzy, c-format msgid "peer %s write failed in working state (error)" msgstr "ピーア %s についてワーキングステートで書き込みに失敗 (エラー)\n" -#: netsync.cc:2586 -#, c-format +#: netsync.cc:2588 +#, fuzzy, c-format msgid "" -"peer %s write failed in shutdown state (possibly client misreported error)\n" +"peer %s write failed in shutdown state (possibly client misreported error)" msgstr "" "ピーア %s についてシャットダウンステートで書き込みに失敗 (おそらくクライアン" "トの誤ったエラー報告です)\n" -#: netsync.cc:2592 +#: netsync.cc:2594 #, fuzzy, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "ピーア %s について確認ステートで書き込みに失敗 (成功)\n" -#: netsync.cc:2619 +#: netsync.cc:2621 #, fuzzy, c-format msgid "peer %s processing finished, disconnecting" msgstr "ピーア %s 処理終了、切断中\n" -#: netsync.cc:2641 +#: netsync.cc:2643 #, fuzzy, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting" msgstr "fd %d (ピーア %s) はアイドル時間が長すぎます。切断中\n" -#: netsync.cc:2709 +#: netsync.cc:2711 #, fuzzy, c-format msgid "beginning service on %s : %s" msgstr "%s : %s でサービスを開始\n" -#: netsync.cc:2710 +#: netsync.cc:2712 msgid "" msgstr "<すべてのインターフェース>" -#: netsync.cc:2724 -#, c-format -msgid "session limit %d reached, some connections will be refused\n" +#: netsync.cc:2726 +#, fuzzy, c-format +msgid "session limit %d reached, some connections will be refused" msgstr "セッション制限 %d に達しました。いくつかの接続は拒否されます\n" -#: netsync.cc:2789 +#: netsync.cc:2791 #, fuzzy, c-format msgid "got OOB from peer %s, disconnecting" msgstr "ピーア %s から OOB データを受信、切断中\n" -#: netsync.cc:2849 +#: netsync.cc:2851 #, fuzzy, c-format msgid "beginning service on %s" msgstr "%s : %s でサービスを開始\n" -#: netsync.cc:2912 +#: netsync.cc:2914 #, fuzzy, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting" msgstr "ピーア %s から OOB データを受信し、切断中\n" -#: netsync.cc:2961 +#: netsync.cc:2963 #, fuzzy, c-format msgid "finding items to synchronize:" msgstr "同期アイテムを検索中:\n" -#: netsync.cc:2969 +#: netsync.cc:2971 msgid "certificates" msgstr "証明書" -#: netsync.cc:3082 +#: netsync.cc:3084 #, c-format msgid "Cannot find key '%s'" msgstr "鍵 '%s' をみつけることができません" -#: netsync.cc:3122 -#, c-format +#: netsync.cc:3124 +#, fuzzy, c-format msgid "" "include branch pattern contains a quote character:\n" -"%s\n" +"%s" msgstr "" "引用符を含むブランチパターンを含める:\n" "%s\n" -#: netsync.cc:3128 -#, c-format +#: netsync.cc:3130 +#, fuzzy, c-format msgid "" "exclude branch pattern contains a quote character:\n" -"%s\n" +"%s" msgstr "" "引用符を含むブランチパターンを含めない:\n" "%s\n" -#: netsync.cc:3160 netsync.cc:3164 +#: netsync.cc:3165 netsync.cc:3169 #, c-format msgid "network error: %s" msgstr "ネットワークエラー: %s" +#: options_list.hh:19 +msgid "override author for commit" +msgstr "コミット時の作成者を上書き指定" + +#: options_list.hh:27 +msgid "block size in bytes for \"automate stdio\" output" +msgstr "" + +#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#, c-format +msgid "cannot be zero or negative" +msgstr "" + +#: options_list.hh:43 +msgid "address:port to listen on (default :4691)" +msgstr "待機する アドレス:ポート (デフォルト: 4691)" + +#: options_list.hh:80 +msgid "disable transport authentication" +msgstr "" + +#: options_list.hh:87 +msgid "serve netsync on stdio" +msgstr "" + +#: options_list.hh:96 +msgid "select branch cert for operation" +msgstr "操作のためのブランチ証明を選択" + +#: options_list.hh:104 +msgid "print a brief version of the normal output" +msgstr "通常出力の簡単なバージョンを表示" + +#: options_list.hh:112 +msgid "set location of configuration directory" +msgstr "設定用のディレクトリの場所を設定" + +#: options_list.hh:122 +msgid "override date/time for commit" +msgstr "コミット時の日時を上書き指定" + +#: options_list.hh:143 +msgid "set name of database" +msgstr "データベース名を設定" + +#: options_list.hh:151 +msgid "print debug log to stderr while running" +msgstr "実行時、標準エラー出力にデバッグログを表示" + +#: options_list.hh:159 +msgid "limit the number of levels of directories to descend" +msgstr "降下するディレクトリの深さを制限" + +#: options_list.hh:164 +#, c-format +msgid "cannot be negative" +msgstr "" + +#: options_list.hh:173 +msgid "argument to pass external diff hook" +msgstr "外部 diff フックに渡す引数" + +#: options_list.hh:182 +msgid "use context diff format" +msgstr "context diff 形式を使用" + +#: options_list.hh:189 +msgid "use external diff hook for generating diffs" +msgstr "差分の生成に外部 diff フックを使用" + +#: options_list.hh:196 +msgid "use unified diff format" +msgstr "unified diff 形式を使用" + +#: options_list.hh:204 +msgid "do not show the function containing each block of changes" +msgstr "" + +#: options_list.hh:211 +msgid "print diffs along with logs" +msgstr "ログと共に差分を表示" + +#: options_list.hh:220 +msgid "when rosterifying, drop attrs entries with the given key" +msgstr "名簿作成中に指定の鍵のエントリの属性を破棄" + +#: options_list.hh:228 +msgid "file to dump debugging log to, on failure" +msgstr "失敗時にデバッグログを出力するファイル" + +#: options_list.hh:237 +msgid "leave out anything described by its argument" +msgstr "引数によって説明されるすべてを省く" + +#: options_list.hh:245 +msgid "perform the associated file operation" +msgstr "関連付けられたファイル操作を実行" + +#: options_list.hh:253 +msgid "print detailed version number, then exit" +msgstr "詳細なバージョン番号を表示し、終了" + +#: options_list.hh:260 +msgid "display help message" +msgstr "ヘルプメッセージを表示" + +#: options_list.hh:269 +#, fuzzy +msgid "include anything described by its argument" +msgstr "引数によって説明されるすべてを省く" + +#: options_list.hh:277 +msgid "set key for signatures" +msgstr "署名の鍵を設定" + +#: options_list.hh:285 +msgid "set location of key store" +msgstr "鍵の保存場所を設定" + +#: options_list.hh:294 +msgid "push the specified key even if it hasn't signed anything" +msgstr "指定の鍵について署名の有無にかかわらず取り込み" + +#: options_list.hh:304 +msgid "limit log output to the last number of entries" +msgstr "ログ出力のエントリ数(最近)を制限" + +#: options_list.hh:313 +msgid "file to write the log to" +msgstr "ログを書き込むファイル" + +#: options_list.hh:324 +msgid "set commit changelog message" +msgstr "コミット変更記録メッセージを設定" + +#: options_list.hh:331 +msgid "set filename containing commit changelog message" +msgstr "コミット変更記録メッセージを含むファイルを設定" + +#: options_list.hh:339 +msgid "perform the operations for files missing from workspace" +msgstr "ワークスペース内ではみつからないファイルについて操作を実行" + +#: options_list.hh:347 +msgid "limit log output to the next number of entries" +msgstr "ログ出力のエントリ数(次)を制限" + +#: options_list.hh:357 +msgid "exclude files when printing logs" +msgstr "ログを表示する際にファイルについては省略" + +#: options_list.hh:365 +msgid "do not ignore any files" +msgstr "" + +#: options_list.hh:373 +msgid "exclude merges when printing logs" +msgstr "ログを表示する際に統合については省略" + +#: options_list.hh:381 +msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" +msgstr "" +"~/.monotone/monotonerc または _MTN/monotonerc lua ファイルを読み込まない" + +#: options_list.hh:389 +msgid "do not load standard lua hooks" +msgstr "標準 lua フックを読み込まない" + +#: options_list.hh:397 +msgid "record process id of server" +msgstr "サーバーのプロセス ID を記録" + +#: options_list.hh:405 +#, fuzzy +msgid "suppress verbose, informational and progress messages" +msgstr "ログおよび進捗を示すメッセージを表示しない" + +#: options_list.hh:415 +msgid "load extra rc file" +msgstr "別の初期化ファイルを読み込む" + +#: options_list.hh:423 +#, fuzzy +msgid "suppress warning, verbose, informational and progress messages" +msgstr "ログおよび進捗を示すメッセージを表示しない" + +#: options_list.hh:433 +msgid "also operate on the contents of any listed directories" +msgstr "一覧のディレクトリの内容についても処理" + +#: options_list.hh:442 +msgid "select revision id for operation" +msgstr "操作のためのリビジョン ID を選択" + +#: options_list.hh:450 +msgid "limit search for workspace to specified root" +msgstr "ワークスペースの検索を指定のルート下に制限" + +#: options_list.hh:458 +msgid "use the current arguments as the future default" +msgstr "現在の引数を将来のデフォルトとして使用" + +#: options_list.hh:466 +msgid "set ticker style (count|dot|none)" +msgstr "ティッカーのスタイルを設定 (count|dot|none)" + +#: options_list.hh:477 +#, c-format +msgid "argument must be 'none', 'dot', or 'count'" +msgstr "" + +#: options_list.hh:482 +msgid "perform the operations for unknown files from workspace" +msgstr "ワークスペース内では不明なファイルについて操作を実行" + +#: options_list.hh:490 +msgid "verbose completion output" +msgstr "冗長な完了メッセージ" + +#: options_list.hh:498 +msgid "print version number, then exit" +msgstr "バージョン番号を表示し、終了" + +#: options_list.hh:506 +msgid "insert command line arguments taken from the given file" +msgstr "指定のファイルの内容をコマンド行引数に挿入" + #: packet.cc:107 #, c-format msgid "file preimage '%s' missing in db" @@ -3036,18 +3212,18 @@ msgstr "不明なパケット型: '%s'" msgstr "不明なパケット型: '%s'" #: rcs_file.cc:354 -#, c-format -msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" +#, fuzzy, c-format +msgid "parse failure %d:%d: expecting %s, got %s with value '%s'" msgstr "解析失敗 %d:%d: 期待値 %s、取得 %s (値 '%s')\n" #: rcs_file.cc:373 -#, c-format -msgid "parse failure %d:%d: expecting word '%s'\n" +#, fuzzy, c-format +msgid "parse failure %d:%d: expecting word '%s'" msgstr "解析失敗 %d:%d: 期待される語句 '%s'\n" #: rcs_file.cc:388 -#, c-format -msgid "parse failure %d:%d: expecting word\n" +#, fuzzy, c-format +msgid "parse failure %d:%d: expecting word" msgstr "解析失敗 %d:%d: 期待される語句\n" #: rcs_import.cc:721 @@ -3088,48 +3264,48 @@ msgstr "タグ" msgid "tags" msgstr "タグ" -#: revision.cc:730 +#: revision.cc:841 #, fuzzy, c-format msgid "scanning for bogus merge edges" msgstr "偽りの統合先端を走査中\n" -#: revision.cc:772 +#: revision.cc:883 #, fuzzy, c-format msgid "optimizing out redundant edge %d -> %d" msgstr "冗長な先端 %d -> %d を最適化中\n" -#: revision.cc:781 +#: revision.cc:892 #, fuzzy, c-format msgid "failed to eliminate edge %d -> %d" msgstr "先端 %d -> %d の除去に失敗\n" -#: revision.cc:792 +#: revision.cc:903 #, fuzzy, c-format msgid "rebuilding %d nodes" msgstr "再構築中: %d ノード\n" -#: revision.cc:997 -#, c-format -msgid "Path %s added to child roster multiple times\n" +#: revision.cc:1108 +#, fuzzy, c-format +msgid "Path %s added to child roster multiple times" msgstr "パス %s が子の名簿に複数回追加されました\n" -#: revision.cc:1010 -#, c-format -msgid "Directory for path %s cannot be added, as there is a file in the way\n" +#: revision.cc:1121 +#, fuzzy, c-format +msgid "Directory for path %s cannot be added, as there is a file in the way" msgstr "" "邪魔になっているファイルがあるので、パス %s のディレクトリを追加できません\n" -#: revision.cc:1021 +#: revision.cc:1132 #, fuzzy, c-format msgid "Path %s cannot be added, as there is a directory in the way" msgstr "邪魔になっているディレクトリがあるので パス %s を追加できません\n" -#: revision.cc:1024 -#, c-format -msgid "Path %s added twice with differing content\n" +#: revision.cc:1135 +#, fuzzy, c-format +msgid "Path %s added twice with differing content" msgstr "異なる内容でパス %s を二回追加しています\n" -#: revision.cc:1311 +#: revision.cc:1422 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3142,19 +3318,38 @@ msgstr "" "(もし単に先に進みたいのなら --drop-attr スウィッチについて参照して下さい。\n" "しかし本当のところそのままにしておいてもらう方が解決には役立ちます。)" -#: revision.cc:1423 +#: revision.cc:1535 #, fuzzy, c-format msgid "converting existing revision graph to new roster-style revisions" msgstr "" "既存のリビジョンのグラフを新しい名簿スタイルのリビジョンに変換しています\n" -#: revision.cc:1478 +#: revision.cc:1590 #, fuzzy, c-format msgid "rebuilding revision graph from manifest certs" msgstr "マニフェスト証明からリビジョングラフを再度構成中\n" -#: revision.cc:1587 +#: revision.cc:1668 #, c-format +msgid "regenerating cached rosters and heights" +msgstr "" + +#: revision.cc:1680 +msgid "regenerated" +msgstr "" + +#: revision.cc:1696 +#, c-format +msgid "finished regenerating cached rosters and heights" +msgstr "" + +#: revision.cc:1708 +#, c-format +msgid "cached height: %s" +msgstr "" + +#: revision.cc:1791 +#, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" "I only know how to understand the version '1' format\n" @@ -3164,159 +3359,179 @@ msgstr "" "理解できるのはバージョン '1' 形式だけです。\n" "この操作を完了するにはより新しいバージョンの monotone が必要です" -#: sanity.cc:126 +#: sanity.cc:148 #, c-format msgid "fatal: formatter failed on %s:%d: %s" msgstr "致命的: フォーマッタ失敗 %s:%d: %s" -#: sanity.cc:200 +#: sanity.cc:222 msgid "misuse: " msgstr "誤り: " -#: sanity.cc:212 +#: sanity.cc:234 msgid "error: " msgstr "エラー: " -#: sanity.cc:220 +#: sanity.cc:242 #, c-format msgid "%s:%d: invariant '%s' violated" msgstr "%s:%d: invariant '%s' violated" -#: sanity.cc:233 -#, c-format -msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" +#: sanity.cc:255 +#, fuzzy, c-format +msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d" msgstr "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" -#: sanity.cc:254 -#, c-format -msgid "Current work set: %i items\n" +#: sanity.cc:276 +#, fuzzy, c-format +msgid "Current work set: %i items" msgstr "現在の作業セット: %i アイテム\n" -#: schema_migration.cc:241 +#: schema_migration.cc:258 #, c-format msgid "calculating necessary migration steps" msgstr "必要な統合ステップを見積っています" -#: schema_migration.cc:251 +#: schema_migration.cc:270 #, c-format msgid "error at transaction BEGIN statement" msgstr "トランザクション BEGIN 文でエラー" -#: schema_migration.cc:252 +#: schema_migration.cc:271 #, c-format msgid "migrating data" msgstr "データを統合しています" -#: schema_migration.cc:278 +#: schema_migration.cc:297 #, c-format msgid "migration step failed: %s" msgstr "統合ステップ失敗: %s" -#: schema_migration.cc:292 +#: schema_migration.cc:311 #, c-format msgid "mismatched result of migration, got %s, wanted %s" msgstr "統合の結果の不一致: 結果 %s, 期待 %s" -#: schema_migration.cc:295 +#: schema_migration.cc:314 #, c-format msgid "committing changes to database" msgstr "変更をデータベースにコミットしています" -#: schema_migration.cc:297 +#: schema_migration.cc:316 #, c-format msgid "failure on COMMIT" msgstr "COMMIT 失敗" -#: schema_migration.cc:299 +#: schema_migration.cc:318 #, c-format msgid "optimizing database" msgstr "データベースを最適化しています" -#: schema_migration.cc:301 +#: schema_migration.cc:320 #, c-format msgid "error vacuuming after migration" msgstr "統合後のバキューム処理中にエラー" -#: schema_migration.cc:304 +#: schema_migration.cc:323 #, c-format msgid "error running analyze after migration" msgstr "統合後に解析実行中にエラー" -#: schema_migration.cc:311 +#: schema_migration.cc:332 #, c-format +msgid "" +"NOTE: because this database was last used by a rather old version\n" +"of monotone, you're not done yet. If you're a project leader, then\n" +"see the file UPGRADE for instructions on running '%s db %s'" +msgstr "" + +#: schema_migration.cc:339 +#, c-format +msgid "" +"NOTE: this upgrade cleared monotone's caches\n" +"you should now run '%s db regenerate_caches'" +msgstr "" + +#: schema_migration.cc:352 +#, c-format msgid "database schema %s is unknown; cannot perform migration" msgstr "不明なデータベーススキーマ %s; 統合できません" -#: schema_migration.cc:316 +#: schema_migration.cc:357 #, fuzzy, c-format msgid "no migration performed; database schema already up-to-date at %s" msgstr "統合しません; データベーススキーマは既に最新になっています: %s\n" -#: schema_migration.cc:866 +#: schema_migration.cc:916 #, c-format msgid "public and private keys for %s don't match" msgstr "%s の公開鍵と秘密鍵が一致しません" -#: schema_migration.cc:869 +#: schema_migration.cc:919 #, c-format msgid "moving key '%s' from database to %s" msgstr "鍵 '%s' をデータベースから %s に移動しています" -#: std_hooks.lua:37 +#: std_hooks.lua:39 msgid "Press enter" msgstr "" -#: std_hooks.lua:39 +#: std_hooks.lua:41 msgid "Press enter when the subprocess has completed" msgstr "サブプロセスが完了したら [Enter] を押して下さい" -#: ui.cc:126 +#: ui.cc:158 #, c-format msgid "%.1f G" msgstr "%.1f G" -#: ui.cc:132 +#: ui.cc:164 #, c-format msgid "%.1f M" msgstr "%.1f M" -#: ui.cc:138 +#: ui.cc:170 #, c-format msgid "%.1f k" msgstr "%.1f k" -#: ui.cc:151 +#: ui.cc:183 #, c-format msgid "%d/%d" msgstr "%d/%d" -#: ui.cc:156 +#: ui.cc:188 #, c-format msgid "%d" msgstr "%d" -#: ui.cc:423 +#: ui.cc:466 msgid "warning: " msgstr "" -#: ui.cc:432 -#, c-format +#: ui.cc:477 +#, fuzzy, c-format msgid "" "fatal: %s\n" "this is almost certainly a bug in monotone.\n" "please send this error message, the output of '%s --full-version',\n" -"and a description of what you were doing to %s.\n" +"and a description of what you were doing to %s." msgstr "" "深刻: %s\n" "これはほぼ確実に monotone のバグでしょう。\n" "このエラーメッセージと '%s --full-version' の結果と %s について\n" "何をしたか説明を添えて報告して下さい\n" -#: ui.cc:493 +#: ui.cc:581 #, fuzzy, c-format msgid "failed to open log file '%s'" msgstr "オプションファイル '%s' の解析に失敗" +#: uri.cc:63 +#, c-format +msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?" +msgstr "" + #: update.cc:72 #, fuzzy, c-format msgid "failed to decode boolean testresult cert value '%s'" @@ -3327,210 +3542,366 @@ msgstr "æ›´æ–°ã™ã‚‹ãƒ–ãƒ©ãƒ³ãƒã‚’æ±ºå® msgid "cannot determine branch for update" msgstr "更新するブランチを決定できません" -#: vocab.cc:65 +#: vocab.cc:67 #, c-format msgid "hex encoded ID '%s' size != %d" msgstr "十六進エンコード ID '%s' サイズ != %d" -#: vocab.cc:69 +#: vocab.cc:71 #, c-format msgid "bad character '%c' in id name '%s'" msgstr "不正な文字 '%c' (ID 名 '%s' 内)" -#: vocab.cc:82 +#: vocab.cc:81 #, c-format msgid "bad character '%c' in ace string '%s'" msgstr "不正な文字 '%c' (ace 文字列 '%s' 内)" -#: vocab.cc:96 +#: vocab.cc:92 #, fuzzy, c-format msgid "bad character '%c' in symbol '%s'" msgstr "不正な文字 '%c' (キー名 '%s' 内)" -#: vocab.cc:110 +#: vocab.cc:103 #, c-format msgid "bad character '%c' in cert name '%s'" msgstr "不正な文字 '%c' (証明 '%s' 内)" -#: vocab.cc:123 +#: vocab.cc:113 #, c-format msgid "bad character '%c' in key name '%s'" msgstr "不正な文字 '%c' (キー名 '%s' 内)" -#: vocab.cc:141 +#: vocab.cc:128 #, c-format msgid "Invalid key length of %d bytes" msgstr "不正な鍵長 %d バイト" -#: vocab.cc:159 +#: vocab.cc:143 #, c-format msgid "Invalid hmac length of %d bytes" msgstr "不正な HMAC 長 %d バイト" -#: work.cc:178 +#: work.cc:88 work_migration.cc:180 work_migration.cc:200 +#, fuzzy, c-format +msgid "workspace is corrupt: reading %s: %s" +msgstr "ワークスペースは壊れています: %s は存在しません" + +#: work.cc:150 +#, fuzzy, c-format +msgid "base revision %s does not exist in database" +msgstr "データベースに基準リビジョン %s は含まれていません\n" + +#: work.cc:284 #, c-format +msgid "unrecognized key '%s' in options file %s - ignored" +msgstr "" + +#: work.cc:291 +#, fuzzy, c-format +msgid "Failed to read options file %s: %s" +msgstr "オプションファイル '%s' の解析に失敗" + +#: work.cc:339 +#, fuzzy, c-format +msgid "Failed to write options file %s: %s" +msgstr "オプションファイル '%s' の書き込みに失敗" + +#: work.cc:541 +#, c-format msgid "skipping ignorable file %s" msgstr "無視できるファイル %s をスキップしています" -#: work.cc:187 +#: work.cc:550 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "既にワークスペースで数に入れられている %s をスキップしています" -#: work.cc:191 +#: work.cc:561 #, c-format msgid "adding %s to workspace manifest" msgstr "ワークスペースのマニフェストに %s を追加しています" -#: work.cc:281 +#: work.cc:567 #, c-format +msgid "" +"cannot add %s, because %s is recorded as a file in the workspace manifest" +msgstr "" + +#: work.cc:682 +#, c-format +msgid "dropping %s" +msgstr "%s を破棄しています" + +#: work.cc:693 work.cc:704 +#, c-format +msgid "path %s already exists" +msgstr "パス %s は既にあります" + +#: work.cc:726 work.cc:756 +#, c-format +msgid "adding %s" +msgstr "%s を追加しています" + +#: work.cc:744 +#, c-format +msgid "path '%s' already exists, cannot create" +msgstr "パス '%s' は既にありますので作成できません" + +#: work.cc:752 +#, c-format +msgid "renaming %s to %s" +msgstr "%s から %s に名称変更しています" + +#: work.cc:787 +#, c-format +msgid "file '%s' does not exist" +msgstr "ファイル '%s' は存在しません" + +#: work.cc:788 +#, c-format +msgid "file '%s' is a directory" +msgstr "ファイル '%s' はディレクトリです" + +#: work.cc:793 +#, c-format +msgid "content of file '%s' has changed, not overwriting" +msgstr "ファイル '%s' の内容は変更されているので上書きしません" + +#: work.cc:794 +#, fuzzy, c-format +msgid "modifying %s" +msgstr "%s を追加しています" + +#: work.cc:979 +#, fuzzy, c-format +msgid "missing %s" +msgstr "%s を追加しています" + +#: work.cc:985 +#, c-format +msgid "" +"%d missing files; use '%s ls missing' to view\n" +"To restore consistency, on each missing file run either\n" +" '%s drop FILE' to remove it permanently, or\n" +" '%s revert FILE' to restore it.\n" +"To handle all at once, simply use\n" +" '%s drop --missing' or\n" +" '%s revert --missing'" +msgstr "" + +#: work.cc:1131 +#, c-format msgid "skipping %s, not currently tracked" msgstr "追跡されていない %s をスキップしています" -#: work.cc:291 +#: work.cc:1141 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "空ではないので %s/ を削除できません" -#: work.cc:302 +#: work.cc:1152 #, c-format msgid "dropping %s from workspace manifest" msgstr "ワークスペースのマニフェストから %s を破棄しています" -#: work.cc:365 -#, c-format -msgid "destination dir %s/ does not exist in current revision" +#: work.cc:1205 +#, fuzzy, c-format +msgid "destination dir %s/ is not versioned (perhaps add it?)" msgstr "現在のリビジョンにディレクトリ %s/ はありません" -#: work.cc:368 +#: work.cc:1208 #, c-format msgid "destination %s is an existing file in current revision" msgstr "現在のリビジョンに %s はありません" -#: work.cc:378 +#: work.cc:1218 #, c-format msgid "empty path %s is not allowed" msgstr "パス %s は空にできません" -#: work.cc:392 -#, c-format -msgid "%s does not exist in current revision" +#: work.cc:1232 +#, fuzzy, c-format +msgid "%s does not exist in current manifest" msgstr "現在のリビジョンに %s はありません" -#: work.cc:395 -#, c-format -msgid "destination %s already exists in current revision" +#: work.cc:1235 +#, fuzzy, c-format +msgid "destination %s already exists in current manifest" msgstr "%s は既に現在のリビジョンにあります" -#: work.cc:404 +#: work.cc:1241 +#, fuzzy, c-format +msgid "destination directory %s does not exist in current manifest" +msgstr "現在のリビジョンにディレクトリ %s/ はありません" + +#: work.cc:1243 +#, fuzzy, c-format +msgid "destination directory %s is not a directory" +msgstr "提案された新しいルートディレクトリ '%s' はディレクトリではありません" + +#: work.cc:1252 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "ワークスペースのマニフェスト内の %s を %s に変更しています" -#: work.cc:429 +#: work.cc:1280 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "ワークスペース内に %s はありませんので、スキップします" -#: work.cc:433 +#: work.cc:1284 #, c-format msgid "destination %s already exists in workspace, skipping" msgstr "リビジョン '%s' は既にデータベースにありますので、スキップします" -#: work.cc:460 +#: work.cc:1314 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" msgstr "" "提案された新しいルートディレクトリ '%s' はバージョン付けされていないか、存在" "しません" -#: work.cc:462 +#: work.cc:1316 #, c-format msgid "proposed new root directory '%s' is not a directory" msgstr "提案された新しいルートディレクトリ '%s' はディレクトリではありません" -#: work.cc:467 +#: work.cc:1321 #, c-format msgid "proposed new root directory '%s' contains illegal path %s" msgstr "" "提案された新しいルートディレクトリ '%s' には不正なパス %s が含まれています" -#: work.cc:477 +#: work.cc:1331 #, c-format msgid "directory '%s' is not versioned or does not exist" msgstr "ディレクトリ '%s' はバージョン付けされていないか、存在しません" -#: work.cc:483 +#: work.cc:1337 #, c-format msgid "'%s' is in the way" msgstr "'%s' が邪魔になっています" -#: work.cc:578 +#: work_migration.cc:62 +#, fuzzy, c-format +msgid "workspace required but not found" +msgstr "ワークスペースが必要ですがみつかりませんでした%s%s" + +#: work_migration.cc:71 #, c-format -msgid "workspace is corrupt: %s does not exist" -msgstr "ワークスペースは壊れています: %s は存在しません" +msgid "_MTN/format should not exist in a format 1 workspace; corrected" +msgstr "" -#: work.cc:579 +#: work_migration.cc:108 #, c-format -msgid "workspace is corrupt: %s is a directory" -msgstr "ワークスペースは壊れています: %s は存在しません" +msgid "" +"this workspace's metadata is in format 0. to use this workspace\n" +"with this version of monotone, you must delete it and check it\n" +"out again (migration from format 0 is not possible).\n" +"once you have done this, you will not be able to use the workspace\n" +"with versions of monotone older than %s.\n" +"we apologize for the inconvenience." +msgstr "" -#: work.cc:589 +#: work_migration.cc:117 #, c-format -msgid "Problem with workspace: %s is unreadable" -msgstr "ワークスペースに問題があります: %s を読み込めません" +msgid "" +"to use this workspace with this version of monotone, its metadata\n" +"must be migrated from format %d to format %d, using the command\n" +"'%s migrate_workspace'.\n" +"once you have done this, you will not be able to use the workspace\n" +"with versions of monotone older than %s." +msgstr "" -#: work.cc:615 +#: work_migration.cc:127 work_migration.cc:255 +#, c-format +msgid "" +"this version of monotone only understands workspace metadata\n" +"in formats 0 through %d. your workspace is in format %d.\n" +"you need a newer version of monotone to use this workspace." +msgstr "" + +#: work_migration.cc:156 +#, c-format +msgid "" +"it is not possible to migrate from workspace format 0 to any\n" +"later format. you must delete this workspace and check it out\n" +"again. we apologize for the inconvenience." +msgstr "" + +#: work_migration.cc:208 #, fuzzy, c-format -msgid "base revision %s does not exist in database" -msgstr "データベースに基準リビジョン %s は含まれていません\n" +msgid "workspace is corrupt: %s exists but is not a regular file" +msgstr "ワークスペースは壊れています: %s は存在しません" -#: work.cc:924 +#: work_migration.cc:247 #, c-format -msgid "dropping %s" -msgstr "%s を破棄しています" +msgid "this workspace is in the current format, no migration is necessary." +msgstr "" -#: work.cc:935 work.cc:946 -#, c-format -msgid "path %s already exists" -msgstr "パス %s は既にあります" +#~ msgid "failed to parse date string '%s': %s" +#~ msgstr "データ文字列 '%s' の解析に失敗: %s" -#: work.cc:968 work.cc:995 -#, c-format -msgid "adding %s" -msgstr "%s を追加しています" +#~ msgid "negative depth not allowed\n" +#~ msgstr "深さの値を負にすることはできません\n" -#: work.cc:984 -#, c-format -msgid "path '%s' already exists, cannot create" -msgstr "パス '%s' は既にありますので作成できません" +#~ msgid "[DIRECTORY]\n" +#~ msgstr "[DIRECTORY]\n" -#: work.cc:991 -#, c-format -msgid "renaming %s to %s" -msgstr "%s から %s に名称変更しています" +#~ msgid "need --branch argument for branch-based checkout" +#~ msgstr "ブランチを基準にしたチェックアウトには --branch 引数が必要です" -#: work.cc:1026 -#, c-format -msgid "file '%s' does not exist" -msgstr "ファイル '%s' は存在しません" +#, fuzzy +#~ msgid "roster %s is not parseable (perhaps with unnormalized paths?)" +#~ msgstr "名簿 %s を解析できません (パスが正規化されていないのでは?)\n" -#: work.cc:1027 -#, c-format -msgid "file '%s' is a directory" -msgstr "ファイル '%s' はディレクトリです" +#, fuzzy +#~ msgid "roster %s is not in normalized form" +#~ msgstr "名簿 %s は正規化された形式になっていません\n" -#: work.cc:1032 -#, c-format -msgid "content of file '%s' has changed, not overwriting" -msgstr "ファイル '%s' の内容は変更されているので上書きしません" +#, fuzzy +#~ msgid "revision %s incomplete (missing roster link)" +#~ msgstr "リビジョン %s は不完全です (名簿のリンクがありません)\n" -#: work.cc:1033 -#, fuzzy, c-format -msgid "modifying %s" -msgstr "%s を追加しています" +#, fuzzy +#~ msgid "%d rosters not parseable (perhaps with invalid paths)" +#~ msgstr "解析できない名簿 (パスが不適切なのでは?): %d\n" #, fuzzy +#~ msgid "%d rosters not in normalized form" +#~ msgstr "正規化された形式になっていない名簿: %d\n" + +#, fuzzy +#~ msgid "%d unreferenced roster links" +#~ msgstr "参照されていない名簿リンク: %d\n" + +#~ msgid "interrupted" +#~ msgstr "割込み" + +#~ msgid "terminated by signal" +#~ msgstr "シグナルで終了" + +#~ msgid "problem parsing arguments from file %s: %s" +#~ msgstr "ファイル %s からの引数を解析中に問題発生: %s" + +#~ msgid "weird error when stuffing arguments read from %s: %s\n" +#~ msgstr "%s から引数を読み取り中に予期せぬエラー発生: %s\n" + +#~ msgid "syntax error near the \"%s\" option: %s" +#~ msgstr "\"%s\" オプションの近くに構文エラー: %s" + +#, fuzzy +#~ msgid "%s %s doesn't use the option %s" +#~ msgstr "monotone %s にはオプション %s は使えません" + +#~ msgid "workspace is corrupt: %s is a directory" +#~ msgstr "ワークスペースは壊れています: %s は存在しません" + +#~ msgid "Problem with workspace: %s is unreadable" +#~ msgstr "ワークスペースに問題があります: %s を読み込めません" + +#, fuzzy #~ msgid "starting with revision 1 / %d" #~ msgstr "リビジョン 1 / %d について作業開始\n" ============================================================ --- po/pt_BR.po 0b41fb4fffac11dbd63f66beeec927a5e0c8a615 +++ po/pt_BR.po ccff69e42d620c1b0ca5e40023ab6b8b8f112324 @@ -7,7 +7,7 @@ msgstr "" msgstr "" "Project-Id-Version: Monotone 0.30\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-19 09:14-0300\n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" "PO-Revision-Date: 2006-11-06 09:11-0300\n" "Last-Translator: Alex Sandro Queiroz e Silva \n" "Language-Team: Alex Sandro Queiroz e Silva \n" @@ -16,179 +16,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:151 +#: app_state.cc:129 #, c-format msgid "workspace required but not found%s%s" msgstr "área de trabalho necessária mas não encontrada%s%s" -#: app_state.cc:159 +#: app_state.cc:137 #, c-format msgid "invalid directory ''" msgstr "diretório inválido ''" -#: app_state.cc:167 +#: app_state.cc:145 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "diretório '%s' de manutenção do monotone já existe em '%s'" -#: app_state.cc:245 +#: app_state.cc:201 #, c-format msgid "search root '%s' does not exist" msgstr "raiz de procura '%s' não existe" -#: app_state.cc:246 -#, c-format -msgid "search root '%s' is not a directory\n" +#: app_state.cc:202 +#, fuzzy, c-format +msgid "search root '%s' is not a directory" msgstr "raiz de procura '%s' não é um diretório\n" -#: app_state.cc:280 -#, c-format -msgid "failed to parse date string '%s': %s" -msgstr "erro lendo string de data '%s': %s" - -#: app_state.cc:295 -#, c-format -msgid "negative depth not allowed\n" -msgstr "profundidade negativa não permitida\n" - -#: app_state.cc:303 -#, c-format -msgid "illegal argument to --last: cannot be zero or negative\n" -msgstr "argumento ilegal para --last: não pode ser zero ou negativo\n" - -#: app_state.cc:311 -#, c-format -msgid "illegal argument to --next: cannot be zero or negative\n" -msgstr "argumento ilegal para --next: não pode ser zero ou negativo\n" - -#: app_state.cc:388 -#, c-format -msgid "illegal argument to --automate-stdio-size: cannot be zero or negative\n" -msgstr "" -"argumento ilegal para --automate-stdio-size: não pode ser zero ou negativo\n" - -#: automate.cc:65 +#: automate.cc:64 msgid "[BRANCH]" msgstr "[RAMO]" -#: automate.cc:89 automate.cc:136 automate.cc:1202 +#: automate.cc:88 automate.cc:135 automate.cc:1206 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "VER1 [VER2 [VER3 [...]]]" -#: automate.cc:99 automate.cc:146 automate.cc:190 automate.cc:331 -#: automate.cc:366 automate.cc:370 automate.cc:429 automate.cc:453 -#: automate.cc:1212 cmd_list.cc:661 +#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330 +#: automate.cc:365 automate.cc:369 automate.cc:428 automate.cc:452 +#: automate.cc:1216 cmd_list.cc:662 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "versão '%s' não existe" -#: automate.cc:184 automate.cc:325 +#: automate.cc:183 automate.cc:324 msgid "[REV1 [REV2 [REV3 [...]]]]" msgstr "[VER1 [VER2 [VER3 [...]]]]" -#: automate.cc:216 +#: automate.cc:215 msgid "FILE" msgstr "ARQUIVO" -#: automate.cc:236 +#: automate.cc:235 #, c-format msgid "file %s is unknown to the current workspace" msgstr "arquivo '%s' é desconhecido para a área de trabalho atual" -#: automate.cc:357 +#: automate.cc:356 msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "VERSÂO_NOVA [VERSÂO_VELHA1 [VERSÃO_VELHA2 [...]]]" -#: automate.cc:424 automate.cc:448 cmd_list.cc:651 +#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 msgid "REV" msgstr "VERSÂO" -#: automate.cc:525 +#: automate.cc:524 msgid "SELECTOR" msgstr "SELETOR" -#: automate.cc:889 automate.cc:1019 +#: automate.cc:893 automate.cc:1023 msgid "[REVID]" msgstr "[VERSÂO]" -#: automate.cc:918 automate.cc:1041 automate.cc:1525 automate.cc:1584 -#: automate.cc:1589 +#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 +#: automate.cc:1593 #, c-format msgid "no revision %s found in database" msgstr "nenhuma versão %s encontrada no banco de dados" -#: automate.cc:1062 automate.cc:1141 +#: automate.cc:1066 automate.cc:1145 msgid "FILEID" msgstr "ID-ARQUIVO" -#: automate.cc:1069 +#: automate.cc:1073 #, c-format msgid "no file version %s found in database" msgstr "nenhuma versão %s do arquivo achada no banco de dados" -#: automate.cc:1088 automate.cc:1114 cmd_merging.cc:845 +#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845 msgid "REVID" msgstr "VERSÂO" -#: automate.cc:1099 automate.cc:1125 automate.cc:1180 automate.cc:1182 -#: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418 +#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 #: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 -#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "versão '%s' não existe" -#: automate.cc:1152 +#: automate.cc:1156 #, c-format msgid "no such file '%s'" msgstr "arquivo '%s' não existe" -#: automate.cc:1168 +#: automate.cc:1172 msgid "OLD_FILE NEW_FILE" msgstr "ARQUIVO_VELHO NOVO_ARQUIVO" -#: automate.cc:1313 +#: automate.cc:1317 msgid "[BRANCH_PATTERN]" msgstr "[PADRÂO_DO_RAMOS]" -#: automate.cc:1409 +#: automate.cc:1413 msgid "KEYID PASSPHRASE" msgstr "CHAVE FRASE-CHAVE" -#: automate.cc:1427 cmd_key_cert.cc:41 +#: automate.cc:1431 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "chave '%s' já existe" -#: automate.cc:1430 cmd_key_cert.cc:44 +#: automate.cc:1434 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "gerando par de chaves '%s'" -#: automate.cc:1432 cmd_key_cert.cc:46 +#: automate.cc:1436 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "salvando par de chaves '%s' em %s/" -#: automate.cc:1468 +#: automate.cc:1472 msgid "OPTION" msgstr "OPÇÃO" -#: automate.cc:1491 +#: automate.cc:1495 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' não é uma opção conhecida para área de trabalho" -#: automate.cc:1514 +#: automate.cc:1518 msgid "REV FILE" msgstr "VERSÃO ARQUIVO" -#: automate.cc:1531 automate.cc:1595 +#: automate.cc:1535 automate.cc:1599 #, c-format msgid "file %s is unknown for revision %s" msgstr "arquivo %s é desconhecido para a versão %s" -#: automate.cc:1574 +#: automate.cc:1578 msgid "REV1 FILE REV2" msgstr "VER1 ARQUIVO VER2" @@ -272,21 +246,27 @@ msgstr "" "vários certificados de ramo encontrados para a versão %s, por favor forneça " "o nome de um ramo" -#: cmd_automate.cc:206 +#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 +#: cmd_automate.cc:340 #, c-format +msgid "Bad input to automate stdio" +msgstr "Entrada inválida para automate stdio" + +#: cmd_automate.cc:168 +#, c-format msgid "read from client failed with error code: %d" msgstr "leitura do cliente falhou com código de erro: %d" -#: cmd_automate.cc:249 -#, c-format -msgid "Bad input to automate stdio" +#: cmd_automate.cc:169 +#, fuzzy, c-format +msgid "Bad input to automate stdio (unexpected EOF)" msgstr "Entrada inválida para automate stdio" -#: cmd_automate.cc:303 +#: cmd_automate.cc:365 msgid "automation" msgstr "automação" -#: cmd_automate.cc:304 +#: cmd_automate.cc:366 msgid "automation interface" msgstr "interface de automação" @@ -300,6 +280,7 @@ msgstr "banco de dados" msgstr "banco de dados" #: cmd_db.cc:47 +#, fuzzy msgid "" "init\n" "info\n" @@ -314,7 +295,7 @@ msgid "" "check\n" "changesetify\n" "rosterify\n" -"regenerate_rosters\n" +"regenerate_caches\n" "set_epoch BRANCH EPOCH\n" msgstr "" "init\n" @@ -368,9 +349,9 @@ msgstr "nenhuma variável com nome %s no msgid "no var with name %s in domain %s" msgstr "nenhuma variável com nome %s no domínio %s" -#: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114 -#: cmd_files.cc:181 cmd_list.cc:457 cmd_merging.cc:614 cmd_ws_commit.cc:355 -#: commands.cc:252 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 +#: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 +#: commands.cc:275 msgid "informative" msgstr "informativo" @@ -387,12 +368,17 @@ msgstr "dígitos não-hexadecimais no id msgid "non-hex digits in partial id" msgstr "dígitos não-hexadecimais no id parcial" -#: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:242 -#: cmd_ws_commit.cc:276 cmd_ws_commit.cc:355 cmd_ws_commit.cc:661 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[CAMINHO]..." -#: cmd_diff_log.cc:332 +#: cmd_diff_log.cc:466 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -405,7 +391,7 @@ msgstr "" "elas é exibida. Se nenhum formato for especificado. o unificado é\n" "usado por padrão." -#: cmd_diff_log.cc:345 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -414,15 +400,20 @@ msgstr "" "--diff-args requer --external\n" "adicione --external ou remova --diff-args" -#: cmd_diff_log.cc:477 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "sem mudanças" -#: cmd_diff_log.cc:541 +#: cmd_diff_log.cc:520 +#, fuzzy +msgid "[FILE [...]]" +msgstr "[ARQUIVO] ..." + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[ARQUIVO] ..." -#: cmd_diff_log.cc:542 +#: cmd_diff_log.cc:604 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -430,7 +421,7 @@ msgstr "" "imprime histórico em ordem inversa (filtrado por 'ARQUIVO'). Se uma ou mais\n" "versões forem dadas, usa-as como ponto de partida." -#: cmd_diff_log.cc:604 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "apenas ou --last ou --next é permitido" @@ -534,37 +525,37 @@ msgstr "nenhum arquivo '%s' encontrado n msgid "no file '%s' found in revision '%s'" msgstr "nenhum arquivo '%s' encontrado na versão '%s'" -#: cmd.hh:108 +#: cmd.hh:89 #, c-format msgid "non-hex digits in id" msgstr "dígitos não-hexadecimais em id" -#: cmd.hh:117 +#: cmd.hh:98 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "id parcial '%s' não tem uma expansão" -#: cmd.hh:121 -#, c-format -msgid "partial id '%s' has multiple ambiguous expansions:\n" +#: cmd.hh:102 +#, fuzzy, c-format +msgid "partial id '%s' has multiple ambiguous expansions:" msgstr "id parcial '%s' tem múltiplas expansões possíveis:\n" -#: cmd.hh:129 +#: cmd.hh:110 #, c-format msgid "expanded partial id '%s' to '%s'" msgstr "id parcial '%s' expandido para '%s'" -#: cmd.hh:212 +#: cmd.hh:195 #, c-format msgid "Alias for %s" msgstr "Apelido para %s" -#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90 -#: cmd_key_cert.cc:111 cmd_key_cert.cc:147 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 +#: cmd_key_cert.cc:113 cmd_key_cert.cc:149 msgid "key and cert" msgstr "chave e certificado" -#: cmd_key_cert.cc:26 cmd_key_cert.cc:51 cmd_key_cert.cc:90 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 msgid "KEYID" msgstr "CHAVEID" @@ -572,27 +563,27 @@ msgstr "gera um par de chaves RSA" msgid "generate an RSA key-pair" msgstr "gera um par de chaves RSA" -#: cmd_key_cert.cc:51 +#: cmd_key_cert.cc:53 msgid "drop a public and private key" msgstr "remove chaves pública e privada" -#: cmd_key_cert.cc:65 +#: cmd_key_cert.cc:67 #, c-format msgid "dropping public key '%s' from database" msgstr "removendo chave pública '%s' do banco de dados" -#: cmd_key_cert.cc:75 +#: cmd_key_cert.cc:77 #, c-format msgid "dropping key pair '%s' from keystore" msgstr "removendo par de chaves '%s' da coleção" -#: cmd_key_cert.cc:82 +#: cmd_key_cert.cc:84 #, 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" -#: cmd_key_cert.cc:85 +#: cmd_key_cert.cc:87 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -601,33 +592,33 @@ msgstr "" "chave pública ou privada '%s' não existe na coleção, e nenhum banco de dados " "foi especificado" -#: cmd_key_cert.cc:91 +#: cmd_key_cert.cc:93 msgid "change passphrase of a private RSA key" msgstr "muda frase secreta de uma chave RSA privada" -#: cmd_key_cert.cc:101 +#: cmd_key_cert.cc:103 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "chave '%s' não existe na coleção" -#: cmd_key_cert.cc:108 +#: cmd_key_cert.cc:110 #, c-format msgid "passphrase changed" msgstr "frase chave mudada" -#: cmd_key_cert.cc:111 +#: cmd_key_cert.cc:113 msgid "REVISION CERTNAME [CERTVAL]" msgstr "VERSÃO NOME-CERTIFICADO [VALOR-CERTIFICADO]" -#: cmd_key_cert.cc:112 +#: cmd_key_cert.cc:114 msgid "create a cert for a revision" msgstr "cria um certificado para uma versão" -#: cmd_key_cert.cc:148 +#: cmd_key_cert.cc:150 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "VERSÃO NOME VALOR ASSINANTE1 [ASSINANTE2 [...]]" -#: cmd_key_cert.cc:149 +#: cmd_key_cert.cc:151 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -635,14 +626,14 @@ msgstr "" "verifica se um certificado hipotético teria confiança\n" "baseado nos parâmetros atuais" -#: cmd_key_cert.cc:182 -#, c-format +#: cmd_key_cert.cc:184 +#, fuzzy, c-format msgid "" "if a cert on: %s\n" "with key: %s\n" "and value: %s\n" "was signed by: %s\n" -"it would be: %s\n" +"it would be: %s" msgstr "" "se um certificado sobre: %s\n" "com chave: %s\n" @@ -650,67 +641,67 @@ msgstr "" "fosse assinado por: %s\n" "ele seria: %s\n" -#: cmd_key_cert.cc:191 +#: cmd_key_cert.cc:193 msgid "trusted" msgstr "confiável" -#: cmd_key_cert.cc:191 +#: cmd_key_cert.cc:193 msgid "UNtrusted" msgstr "NÃO-confiável" -#: cmd_key_cert.cc:194 cmd_key_cert.cc:207 cmd_key_cert.cc:220 -#: cmd_key_cert.cc:236 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:189 msgid "review" msgstr "revisão" -#: cmd_key_cert.cc:194 +#: cmd_key_cert.cc:197 msgid "REVISION TAGNAME" msgstr "VERSÃO ETIQUETA" -#: cmd_key_cert.cc:195 +#: cmd_key_cert.cc:198 msgid "put a symbolic tag cert on a revision" msgstr "põe um certificado de etiqueta simbólica em uma versão" -#: cmd_key_cert.cc:207 +#: cmd_key_cert.cc:210 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: cmd_key_cert.cc:208 +#: cmd_key_cert.cc:211 msgid "note the results of running a test on a revision" msgstr "anota os resultados de executar um teste sobre uma versão" -#: cmd_key_cert.cc:220 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:189 msgid "REVISION" msgstr "VERSÂO" -#: cmd_key_cert.cc:221 +#: cmd_key_cert.cc:224 msgid "approve of a particular revision" msgstr "aprova a versão especificada" -#: cmd_key_cert.cc:232 +#: cmd_key_cert.cc:235 #, c-format msgid "need --branch argument for approval" msgstr "argumento --branch necessário para aprovação" -#: cmd_key_cert.cc:236 +#: cmd_key_cert.cc:239 msgid "REVISION [COMMENT]" msgstr "VERSÃO [COMENTÁRIO]" -#: cmd_key_cert.cc:237 +#: cmd_key_cert.cc:240 msgid "comment on a particular revision" msgstr "comenta a versão especificada" -#: cmd_key_cert.cc:249 +#: cmd_key_cert.cc:252 #, c-format msgid "edit comment failed" msgstr "edição de comentário falhou" -#: cmd_key_cert.cc:254 +#: cmd_key_cert.cc:257 #, c-format msgid "empty comment" msgstr "comentário vazio" -#: cmd_list.cc:64 cmd_list.cc:675 +#: cmd_list.cc:64 cmd_list.cc:676 #, c-format msgid "no public key '%s' found in database" msgstr "chave pública '%s' não encontrada no banco de dados" @@ -760,7 +751,7 @@ msgstr "nenhuma era para ramo %s" msgid "no epoch for branch %s" msgstr "nenhuma era para ramo %s" -#: cmd_list.cc:458 +#: cmd_list.cc:459 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -786,7 +777,7 @@ msgstr "" "missing\n" "changed" -#: cmd_list.cc:469 +#: cmd_list.cc:470 msgid "" "show database objects, or the current workspace manifest, \n" "or known, unknown, intentionally ignored, missing, or \n" @@ -797,8 +788,8 @@ msgstr "" "faltando ou que mudaram de estado" #: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66 -#: cmd_ws_commit.cc:242 cmd_ws_commit.cc:276 cmd_ws_commit.cc:311 -#: cmd_ws_commit.cc:336 cmd_ws_commit.cc:561 cmd_ws_commit.cc:661 +#: cmd_ws_commit.cc:252 cmd_ws_commit.cc:293 cmd_ws_commit.cc:329 +#: cmd_ws_commit.cc:354 cmd_ws_commit.cc:579 cmd_ws_commit.cc:679 msgid "workspace" msgstr "área de trabalho" @@ -918,8 +909,8 @@ msgstr "[combinado] %s" msgstr "[combinado] %s" #: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588 -#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:901 -#: cmd_ws_commit.cc:924 cmd_ws_commit.cc:938 +#: cmd_merging.cc:821 cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 msgid "tree" msgstr "árvore" @@ -933,7 +924,7 @@ msgstr "por favor especifique um ramo co msgstr "por favor especifique um ramo com --branch=RAMO" #: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 -#: cmd_ws_commit.cc:445 +#: cmd_ws_commit.cc:463 #, c-format msgid "branch '%s' is empty" msgstr "ramo '%s' está vazio" @@ -1166,88 +1157,88 @@ msgstr "exibe conteúdo do roster associ msgid "dump the roster associated with the given REVID" msgstr "exibe conteúdo do roster associado com VERSÃO" -#: cmd_netsync.cc:40 +#: cmd_netsync.cc:43 #, c-format msgid "setting default server to %s" msgstr "configurando servidor padrão para %s" -#: cmd_netsync.cc:46 +#: cmd_netsync.cc:49 #, c-format msgid "no hostname given" msgstr "nenhum nome de host dado" -#: cmd_netsync.cc:48 +#: cmd_netsync.cc:51 #, c-format msgid "no server given and no default server set" msgstr "nenhum servidor dado e nenhum servidor padrão configurado" -#: cmd_netsync.cc:59 cmd_netsync.cc:79 +#: cmd_netsync.cc:79 cmd_netsync.cc:101 #, c-format msgid "no branch pattern given" msgstr "nenhum padrão de ramos dado" -#: cmd_netsync.cc:67 +#: cmd_netsync.cc:88 #, c-format msgid "setting default branch include pattern to '%s'" msgstr "configurando padrão de inclusão de ramos para '%s'" -#: cmd_netsync.cc:73 +#: cmd_netsync.cc:95 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "configurando padrão de exclusão de ramos para '%s'" -#: cmd_netsync.cc:81 +#: cmd_netsync.cc:103 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "nenhum padrão de ramo dado e nenhum configurado" -#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 msgid "network" msgstr "rede" -#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 +#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ENDEREÇO[:PORTA] [PADRÃO]]" -#: cmd_netsync.cc:98 +#: cmd_netsync.cc:120 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "envia ramos que combinam com PADRÃO para servidor netsync em ENDEREÇO" -#: cmd_netsync.cc:113 +#: cmd_netsync.cc:133 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "recebe ramos que combinam com PADRÃO do servidor netsync em ENDEREÇO" -#: cmd_netsync.cc:120 +#: cmd_netsync.cc:141 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "" "recebendo dados anonimamente; use -kNOMEDACHAVE se for necessária " "autenticação" -#: cmd_netsync.cc:127 +#: cmd_netsync.cc:148 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" -#: cmd_netsync.cc:149 +#: cmd_netsync.cc:167 #, c-format msgid "pid file '%s' already exists" msgstr "arquivo pid '%s' já existe" -#: cmd_netsync.cc:151 +#: cmd_netsync.cc:169 #, c-format msgid "failed to create pid file '%s'" msgstr "erro criando arquivo de PID '%s'" -#: cmd_netsync.cc:173 +#: cmd_netsync.cc:191 msgid "PATTERN ..." msgstr "PADRÂO..." -#: cmd_netsync.cc:174 +#: cmd_netsync.cc:192 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "serve os ramos especificados por PADRÂO para clientes" -#: cmd_netsync.cc:190 +#: cmd_netsync.cc:208 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1255,7 +1246,7 @@ msgstr "" "é necessária permissão para salvar frase-passe persistentemente (veja gancho " "persist_phrase_ok())" -#: cmd_netsync.cc:196 +#: cmd_netsync.cc:214 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1382,25 +1373,35 @@ msgstr "desaprova a versão especificada msgid "disapprove of a particular revision" msgstr "desaprova a versão especificada" -#: cmd_ws_commit.cc:203 -#, c-format -msgid "revision '%s' has %d changesets, cannot invert\n" +#: cmd_ws_commit.cc:206 +#, fuzzy, c-format +msgid "revision %s has %d changesets, cannot invert" msgstr "versão %s tem %d mudanças, não é possível inverter\n" -#: cmd_ws_commit.cc:207 +#: cmd_ws_commit.cc:210 #, c-format msgid "need --branch argument for disapproval" msgstr "argumento --branch necessário para desaprovação" -#: cmd_ws_commit.cc:243 +#: cmd_ws_commit.cc:253 msgid "add files to workspace" msgstr "adiciona arquivos à área de trabalho" -#: cmd_ws_commit.cc:277 +#: cmd_ws_commit.cc:260 +#, c-format +msgid "cannot set '--unknown' and '--recursive' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:262 +#, c-format +msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" +msgstr "" + +#: cmd_ws_commit.cc:294 msgid "drop files from workspace" msgstr "remove arquivos da área de trabalho" -#: cmd_ws_commit.cc:312 +#: cmd_ws_commit.cc:330 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1408,15 +1409,15 @@ msgstr "" "ORIGEM DESTINO\n" "ORIGEM1 [ORIGEM2 [...]] DIRETÓRIO_DESTINO" -#: cmd_ws_commit.cc:314 +#: cmd_ws_commit.cc:332 msgid "rename entries in the workspace" msgstr "renomeia entradas na área de trabalho" -#: cmd_ws_commit.cc:336 +#: cmd_ws_commit.cc:354 msgid "NEW_ROOT PUT_OLD" msgstr "NOVA_RAIZ COLOCAR_O_ANTIGO" -#: cmd_ws_commit.cc:337 +#: cmd_ws_commit.cc:355 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1430,31 +1431,31 @@ msgstr "" "COLOCAR_O_ANTIGO.\n" "Usar --execute é altamente recomendado." -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:373 msgid "show status of workspace" msgstr "mostra status da área de trabalho" -#: cmd_ws_commit.cc:384 +#: cmd_ws_commit.cc:402 #, c-format msgid "Current branch: %s" msgstr "Ramo atual: %s" -#: cmd_ws_commit.cc:390 +#: cmd_ws_commit.cc:408 #, c-format msgid "Changes against parent %s" msgstr "Diferenças entre o pai %s" -#: cmd_ws_commit.cc:395 +#: cmd_ws_commit.cc:413 #, c-format msgid " no changes" msgstr " sem mudanças" -#: cmd_ws_commit.cc:399 +#: cmd_ws_commit.cc:417 #, c-format msgid " dropped %s" msgstr " %s descartado" -#: cmd_ws_commit.cc:404 +#: cmd_ws_commit.cc:422 #, c-format msgid "" " renamed %s\n" @@ -1463,21 +1464,21 @@ msgstr "" " %s foi renomeado\n" " para %s" -#: cmd_ws_commit.cc:409 cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 #, c-format msgid " added %s" msgstr " %s foi adicionado" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:435 #, c-format msgid " patched %s" msgstr " %s foi modificado" -#: cmd_ws_commit.cc:421 -msgid "[DIRECTORY]\n" -msgstr "[DIRETÓRIO]\n" +#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +msgid "[DIRECTORY]" +msgstr "[DIRETÓRIO]" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:440 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" @@ -1490,47 +1491,47 @@ msgstr "" "Se nenhum nome de diretório for dado, o nome do ramo será usado como\n" "diretório" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:458 #, c-format msgid "use --revision or --branch to specify what to checkout" msgstr "use --revision ou --branch para especificar o que será extraído" -#: cmd_ws_commit.cc:448 +#: cmd_ws_commit.cc:466 #, c-format msgid "branch %s has multiple heads:" msgstr "ramo %s tem frentes múltiplas:" -#: cmd_ws_commit.cc:451 +#: cmd_ws_commit.cc:469 #, c-format msgid "choose one with '%s checkout -r'" msgstr "escolha um com '%s update -r'" -#: cmd_ws_commit.cc:452 +#: cmd_ws_commit.cc:470 #, c-format msgid "branch %s has multiple heads" msgstr "ramo %s tem frentes múltiplas" -#: cmd_ws_commit.cc:479 +#: cmd_ws_commit.cc:497 #, c-format msgid "revision %s is not a member of branch %s" msgstr "versão %s não é um membro do ramo %s" -#: cmd_ws_commit.cc:496 +#: cmd_ws_commit.cc:514 #, c-format msgid "you must specify a destination directory" msgstr "um diretório de destino deve ser especificado" -#: cmd_ws_commit.cc:509 +#: cmd_ws_commit.cc:527 #, c-format msgid "checkout directory '%s' already exists" msgstr "diretório de saída '%s' já existe" -#: cmd_ws_commit.cc:543 +#: cmd_ws_commit.cc:561 #, c-format msgid "no file %s found in database for %s" msgstr "nenhum arquivo %s encontrado no banco de dados para %s" -#: cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:579 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1540,45 +1541,45 @@ msgstr "" "get CAMINHO [ATRIBUTO]\n" "drop CAMINHO [ATRIBUTO]" -#: cmd_ws_commit.cc:562 +#: cmd_ws_commit.cc:580 msgid "set, get or drop file attributes" msgstr "configura, lê ou descarta atributos de arquivos" -#: cmd_ws_commit.cc:579 +#: cmd_ws_commit.cc:597 #, c-format msgid "Unknown path '%s'" msgstr "caminho desconhecido '%s'" -#: cmd_ws_commit.cc:608 -#, c-format -msgid "Path '%s' does not have attribute '%s'\n" +#: cmd_ws_commit.cc:626 +#, fuzzy, c-format +msgid "Path '%s' does not have attribute '%s'" msgstr "Caminho '%s' não tem atributo '%s'\n" -#: cmd_ws_commit.cc:638 +#: cmd_ws_commit.cc:656 #, c-format msgid "No attributes for '%s'" msgstr "Nenhum atributo para '%s'" -#: cmd_ws_commit.cc:649 +#: cmd_ws_commit.cc:667 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Nenhum atributo '%s' no caminho '%s'" -#: cmd_ws_commit.cc:662 +#: cmd_ws_commit.cc:680 msgid "commit workspace to database" msgstr "grava mudanças da área de trabalho no banco de dados" -#: cmd_ws_commit.cc:693 +#: cmd_ws_commit.cc:711 #, c-format msgid "no changes to commit" msgstr "nenhuma mudança para gravar" -#: cmd_ws_commit.cc:707 +#: cmd_ws_commit.cc:731 #, c-format msgid "beginning commit on branch '%s'" msgstr "iniciando gravação do ramo '%s'" -#: cmd_ws_commit.cc:716 +#: cmd_ws_commit.cc:740 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1590,37 +1591,37 @@ msgstr "" "considere mover ou apagar _MTN/log,\n" "ou remova --message/--message-from-file da linha de comando" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:755 #, c-format msgid "empty log message; commit canceled" msgstr "entrada no registro vazia, gravação cancelada" -#: cmd_ws_commit.cc:753 +#: cmd_ws_commit.cc:777 #, c-format msgid "log message rejected by hook: %s" msgstr "entrada no registro rejeitada pelo hook: %s" -#: cmd_ws_commit.cc:761 +#: cmd_ws_commit.cc:785 #, c-format msgid "revision %s already in database" msgstr "versão %s já está no banco de dados" -#: cmd_ws_commit.cc:800 cmd_ws_commit.cc:830 +#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "arquivo '%s' modificado durante gravação, abortando" -#: cmd_ws_commit.cc:812 +#: cmd_ws_commit.cc:836 #, c-format msgid "Your database is missing version %s of file '%s'" msgstr "O seu banco de dados não tem a versão %s do arquivo '%s'" -#: cmd_ws_commit.cc:862 +#: cmd_ws_commit.cc:886 #, c-format msgid "committed revision %s" msgstr "versão %s gravada" -#: cmd_ws_commit.cc:868 +#: cmd_ws_commit.cc:892 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1629,20 +1630,16 @@ msgstr "" "nota: esta versão cria divergência\n" "nota: talvez você queira executar '%s merge'" -#: cmd_ws_commit.cc:901 cmd_ws_commit.cc:924 -msgid "[DIRECTORY]" -msgstr "[DIRETÓRIO]" - -#: cmd_ws_commit.cc:902 +#: cmd_ws_commit.cc:926 msgid "setup a new workspace directory, default to current" msgstr "configura um novo diretório como área de trabalho, o padrão é o atual" -#: cmd_ws_commit.cc:908 +#: cmd_ws_commit.cc:932 #, c-format msgid "need --branch argument for setup" msgstr "argumento --branch é necessário para configuração" -#: cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:949 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -1650,57 +1647,57 @@ msgstr "" "migra os metadados de uma área de trabalho para o último formato; a área de " "trabalho atual é usada por omissão" -#: cmd_ws_commit.cc:938 +#: cmd_ws_commit.cc:962 msgid "refresh the inodeprint cache" msgstr "atualiza o cache de inodeprint" -#: commands.cc:131 commands.cc:233 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "comando desconhecido '%s'" -#: commands.cc:142 -#, c-format -msgid "command '%s' has multiple ambiguous expansions:\n" +#: commands.cc:150 +#, fuzzy, c-format +msgid "command '%s' has multiple ambiguous expansions:" msgstr "comando '%s' tem várias expansões possíveis:\n" -#: commands.cc:175 +#: commands.cc:183 msgid "commands:" msgstr "comandos:" -#: commands.cc:252 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "comando [ARGS...]" -#: commands.cc:252 +#: commands.cc:276 msgid "display command help" msgstr "exibe ajuda de comando" -#: commands.cc:395 +#: commands.cc:420 #, c-format msgid "expanding selection '%s'" msgstr "expandindo seleção '%s'" -#: commands.cc:403 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "sem equivalente para seleção '%s'" -#: commands.cc:409 +#: commands.cc:434 #, c-format msgid "expanded to '%s'" msgstr "expandido para '%s'" -#: commands.cc:426 -#, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" +#: commands.cc:451 +#, fuzzy, c-format +msgid "selection '%s' has multiple ambiguous expansions:" msgstr "seleção '%s' tem múltiplas expansões ambíguas:\n" -#: commands.cc:443 +#: commands.cc:468 msgid "note: " msgstr "nota: " -#: commands.cc:444 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1709,70 +1706,78 @@ msgstr "" "ramo '%s' tem múltiplas frentes\n" "considere usar '%s merge'" -#: commands.cc:458 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message e --message-file são mutuamente exclusivos" -#: database_check.cc:129 +#: database_check.cc:137 #, c-format msgid "file structure is corrupted; cannot check further" msgstr "estrutura de arquivos está corrompida; é impossível verificar mais" -#: database_check.cc:140 +#: database_check.cc:148 msgid "files" msgstr "arquivos" -#: database_check.cc:169 +#: database_check.cc:177 msgid "rosters" msgstr "rosters" -#: database_check.cc:227 +#: database_check.cc:235 msgid "markings" msgstr "marcas" -#: database_check.cc:298 netsync.cc:2967 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 msgid "revisions" msgstr "versões" -#: database_check.cc:393 +#: database_check.cc:401 msgid "ancestry" msgstr "descendência" -#: database_check.cc:426 netsync.cc:2971 +#: database_check.cc:434 netsync.cc:2973 msgid "keys" msgstr "chaves" -#: database_check.cc:452 +#: database_check.cc:460 msgid "certs" msgstr "certificados" -#: database_check.cc:489 +#: database_check.cc:504 +msgid "heights" +msgstr "" + +#: database_check.cc:548 +msgid "height relations" +msgstr "" + +#: database_check.cc:594 #, c-format msgid "file %s missing (%d manifest references)" msgstr "arquivo %s faltando (%d referências no manifesto)" -#: database_check.cc:496 +#: database_check.cc:601 #, c-format msgid "file %s unreferenced" msgstr "arquivo %s não referenciado" -#: database_check.cc:515 +#: database_check.cc:620 #, c-format msgid "roster %s unreferenced" msgstr "inventório %s não referenciado" -#: database_check.cc:521 +#: database_check.cc:626 #, c-format msgid "roster %s incomplete (%d missing files)" msgstr "inventório %s está incompleto (%d arquivos faltando)" -#: database_check.cc:528 +#: database_check.cc:633 #, c-format msgid "roster %s incomplete (%d missing revisions)" msgstr "inventório %s está incompleto (%d versões faltando)" -#: database_check.cc:553 +#: database_check.cc:658 #, c-format msgid "" "revision %s missing (%d revision references; %d cert references; %d parent " @@ -1782,198 +1787,230 @@ msgstr "" "certificados; %d referências de pais; %d referências de filhos; %d " "referências de inventório)" -#: database_check.cc:561 +#: database_check.cc:666 #, c-format msgid "revision %s incomplete (%d missing manifests)" msgstr "versão %s está incompleta (%d listagens faltando)" -#: database_check.cc:568 +#: database_check.cc:673 #, c-format msgid "revision %s incomplete (%d missing revisions)" msgstr "versão %s está incompleta (%d versões faltando)" -#: database_check.cc:575 +#: database_check.cc:680 #, c-format msgid "revision %s incomplete (missing roster)" msgstr "versão %s está incompleta (falta inventório)" -#: database_check.cc:581 +#: database_check.cc:686 #, c-format msgid "revision %s mismatched roster and manifest" msgstr "versão %s: inventório e listagem não combinam" -#: database_check.cc:587 +#: database_check.cc:692 #, c-format msgid "revision %s incomplete (incomplete roster)" msgstr "versão %s está incompleta (inventório incompleto)" -#: database_check.cc:593 +#: database_check.cc:698 #, c-format msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)" msgstr "versão %s: pais não combinam (%d ancestrais; %d referências)" -#: database_check.cc:602 +#: database_check.cc:707 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)" msgstr "filhos da versão %s não combinam (%d filhos, %d pais)" -#: database_check.cc:614 +#: database_check.cc:719 #, c-format msgid "revision %s has bad history (%s)" msgstr "versão %s tem um histórico inválido (%s)" -#: database_check.cc:621 +#: database_check.cc:726 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)" msgstr "versão %s está ilegível (talvez com caminhos não normalizados?)" -#: database_check.cc:628 +#: database_check.cc:733 #, c-format msgid "revision %s is not in normalized form" msgstr "versão %s não está na forma normalizada" -#: database_check.cc:652 +#: database_check.cc:757 #, c-format msgid "key %s missing (signed %d certs)" msgstr "chave %s está faltando (assinou %d certificados)" -#: database_check.cc:685 +#: database_check.cc:790 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s" msgstr "" "versão %s: assinatura não verificada no certificado %s da chave desaparecida " "%s" -#: database_check.cc:693 +#: database_check.cc:798 #, c-format msgid "revision %s bad signature in %s cert from key %s" msgstr "versão %s: assinatura inválida no certificado %s da chave %s" -#: database_check.cc:708 +#: database_check.cc:813 #, c-format msgid "revision %s missing %s cert" msgstr "versão %s: certificado %s faltando" -#: database_check.cc:717 +#: database_check.cc:822 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)" msgstr "" "certificados da versão %s não combinam\n" "(%d autores %d datas %d registros de mudança" -#: database_check.cc:797 +#: database_check.cc:846 +#, fuzzy, c-format +msgid "height missing for revision %s" +msgstr "%d versões faltando" + +#: database_check.cc:853 +#, fuzzy, c-format +msgid "duplicate height for revision %s" +msgstr "atualizado para versão-base %s" + +#: database_check.cc:859 #, c-format +msgid "height of revision %s not greater than that of parent" +msgstr "" + +#: database_check.cc:944 +#, c-format msgid "%d missing files" msgstr "%d arquivos desaparecidos" -#: database_check.cc:799 +#: database_check.cc:946 #, c-format msgid "%d unreferenced files" msgstr "%d arquivos não referenciados" -#: database_check.cc:802 +#: database_check.cc:949 #, c-format msgid "%d unreferenced rosters" msgstr "%d inventários não referenciados" -#: database_check.cc:804 +#: database_check.cc:951 #, c-format msgid "%d incomplete rosters" msgstr "%d inventários incompletos" -#: database_check.cc:807 +#: database_check.cc:954 #, c-format msgid "%d missing revisions" msgstr "%d versões faltando" -#: database_check.cc:809 +#: database_check.cc:956 #, c-format msgid "%d incomplete revisions" msgstr "%d versões incompletas" -#: database_check.cc:811 +#: database_check.cc:958 #, c-format msgid "%d mismatched parents" msgstr "%d pais não combinam" -#: database_check.cc:813 +#: database_check.cc:960 #, c-format msgid "%d mismatched children" msgstr "%d filhos não combinam" -#: database_check.cc:815 +#: database_check.cc:962 #, c-format msgid "%d revisions with bad history" msgstr "%d versões com histórico inválido" -#: database_check.cc:817 +#: database_check.cc:964 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)" msgstr "%d versões ilegíveis (talvez com caminhos inválidos)" -#: database_check.cc:820 +#: database_check.cc:967 #, c-format msgid "%d revisions not in normalized form" msgstr "%d versões não estão na forma normalizada" -#: database_check.cc:824 +#: database_check.cc:971 #, c-format msgid "%d missing rosters" msgstr "%d inventórios faltando" -#: database_check.cc:828 +#: database_check.cc:975 #, c-format msgid "%d missing keys" msgstr "%d chaves faltando" -#: database_check.cc:831 +#: database_check.cc:978 #, c-format msgid "%d missing certs" msgstr "%d certificados fantando" -#: database_check.cc:833 +#: database_check.cc:980 #, c-format msgid "%d mismatched certs" msgstr "%d certificados fantando" -#: database_check.cc:835 +#: database_check.cc:982 #, c-format msgid "%d unchecked signatures due to missing keys" msgstr "%d assinaturas não verificadas devido a chaves faltando" -#: database_check.cc:837 +#: database_check.cc:984 #, c-format msgid "%d bad signatures" msgstr "%d assinaturas ruins" -#: database_check.cc:861 +#: database_check.cc:987 +#, fuzzy, c-format +msgid "%d missing heights" +msgstr "%d certificados fantando" + +#: database_check.cc:989 #, c-format -msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs" +msgid "%d duplicate heights" msgstr "" + +#: database_check.cc:991 +#, fuzzy, c-format +msgid "%d incorrect heights" +msgstr "%d versões incompletas" + +#: database_check.cc:1017 +#, fuzzy, c-format +msgid "" +"check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d " +"heights" +msgstr "" "verificação completa: %d arquivos; %d inventórios; %d versões; %d chaves; %d " "certificados" -#: database_check.cc:867 +#: database_check.cc:1024 #, c-format msgid "total problems detected: %d (%d serious)" msgstr "total de problemas detectados: %d (%d sérios)" -#: database_check.cc:869 +#: database_check.cc:1026 #, c-format msgid "serious problems detected" msgstr "problemas sérios detectados" -#: database_check.cc:871 +#: database_check.cc:1028 #, c-format msgid "minor problems detected" msgstr "problemas menores detectados" -#: database_check.cc:873 +#: database_check.cc:1030 #, c-format msgid "database is good" msgstr "o banco de dados está bem" -#: database.cc:158 +#: database.cc:159 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -1986,12 +2023,12 @@ msgstr "" "tente '%s db migrate' para atualizar\n" "(isto é irreversível, uma cópia de segurança pode ser necessária)" -#: database.cc:172 +#: database.cc:173 #, c-format msgid "this database already contains rosters" msgstr "este banco de dados já contém inventórios" -#: database.cc:196 +#: database.cc:200 #, c-format msgid "" "database %s contains old-style revisions\n" @@ -2010,7 +2047,7 @@ msgstr "" " então puxe as versões para um novo banco de dados.\n" "lamentamos pela incoveniência." -#: database.cc:206 +#: database.cc:210 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -2021,30 +2058,29 @@ msgstr "" "este é um banco de dados muito velho; ele precisa ser atualizado\n" "por favor leia README.changesets para detalhes" -#: database.cc:217 -#, c-format +#: database.cc:221 +#, fuzzy, c-format msgid "" -"database %s contains revisions but no rosters\n" -"probably this is because an upgrade cleared the roster cache\n" -"run '%s db regenerate_rosters' to restore use of this database" +"database %s misses some cached data\n" +"run '%s db regenerate_caches' to restore use of this database" msgstr "" "o banco de dados %s contém versões mas não inventórios\n" "provavelmente a causa é uma atualização que limpou o cache de\n" "inventórios\n" "execute '%s db regenerate_rosters' para restaurar este banco de dados" -#: database.cc:256 +#: database.cc:259 #, c-format msgid "unable to probe database version in file %s" msgstr "incapaz de verificar a versão do banco de dados no arquivo %s" -#: database.cc:263 +#: database.cc:266 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" "banco de dados %s não é um arquivo sqlite versão 3, tente dump e reload" -#: database.cc:292 schema_migration.cc:201 +#: database.cc:293 schema_migration.cc:201 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -2052,7 +2088,7 @@ msgstr "" "certifique-se de que o banco de dados e o diretório continente podem\n" "ser escritos e você ainda tem espaço livre do disco" -#: database.cc:298 schema_migration.cc:206 +#: database.cc:297 schema_migration.cc:206 #, c-format msgid "" "sqlite error: %s\n" @@ -2061,12 +2097,12 @@ msgstr "" "erro da sqlite: %s\n" "%s" -#: database.cc:343 +#: database.cc:342 #, c-format msgid "could not initialize database: %s: already exists" msgstr "erro inicializando banco de dados: %s: já existe" -#: database.cc:348 +#: database.cc:347 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2076,13 +2112,13 @@ msgstr "" "arquivo de jornal '%s' existente tem a mesma raiz que novo banco de dados\n" "%s, cancelando criação" -#: database.cc:498 +#: database.cc:497 #, c-format msgid "cannot create %s; it already exists" msgstr "erro criando %s; já existe" -#: database.cc:575 -#, c-format +#: database.cc:574 +#, fuzzy, c-format msgid "" "schema version : %s\n" "counts:\n" @@ -2102,10 +2138,11 @@ msgid "" " revisions : %u\n" " cached ancestry : %u\n" " certs : %u\n" +" heights : %u\n" " total : %u\n" "database:\n" " page size : %u\n" -" cache size : %u\n" +" cache size : %u" msgstr "" "versão do esquema : %s\n" "contagens:\n" @@ -2130,52 +2167,52 @@ msgstr "" " tamanho da página: %u\n" " tamanho do cache : %u\n" -#: database.cc:637 +#: database.cc:639 #, c-format msgid "database schema version: %s" msgstr "versão do esquema do banco de dados: %s" -#: database.cc:714 -#, c-format -msgid "multiple statements in query: %s\n" +#: database.cc:716 +#, fuzzy, c-format +msgid "multiple statements in query: %s" msgstr "múltiplos comandos na consulta: %s\n" -#: database.cc:720 +#: database.cc:722 #, c-format msgid "wanted %d columns got %d in query: %s" msgstr "%d colunas pedidas, %d colunas obtidas da consulta: %s" -#: database.cc:786 +#: database.cc:788 #, c-format msgid "null result in query: %s" msgstr "resultado vazio da consulta: %s" -#: database.cc:804 +#: database.cc:806 #, c-format msgid "wanted %d rows got %d in query: %s" msgstr "%d linhas pedidas, %d linhas obtidas da consulta: %s" -#: database.cc:1951 +#: database.cc:2040 #, c-format msgid "another key with name '%s' already exists" msgstr "outra chave com nome '%s' já existe" -#: database.cc:2948 +#: database.cc:3037 #, c-format msgid "no database specified" msgstr "nenhum banco de dados especificado" -#: database.cc:2956 +#: database.cc:3045 #, c-format msgid "database %s does not exist" msgstr "banco de dados %s não existe" -#: database.cc:2957 +#: database.cc:3046 #, c-format msgid "%s is a directory, not a database" msgstr "%s é um diretório, não um banco de dados" -#: database.cc:2982 +#: database.cc:3071 #, c-format msgid "could not open database '%s': %s" msgstr "erro abrindo banco de dados '%s': %s" @@ -2196,13 +2233,13 @@ msgstr "arquivo %s na área de trabalho msgstr "arquivo %s na área de trabalho tem id %s, pedido %s" #: diff_patch.cc:744 -#, c-format +#, fuzzy, c-format msgid "" "help required for 3-way merge\n" "[ancestor] %s\n" "[ left] %s\n" "[ right] %s\n" -"[ merged] %s\n" +"[ merged] %s" msgstr "" "ajuda necessária para combinação 3 caminhos\n" "[ancestral] %s\n" @@ -2347,7 +2384,7 @@ msgstr "erro de execução %s capturado msgid "caught runtime error %s constructing file path for %s" msgstr "erro de execução %s capturado construindo caminho do arquivo %s" -#: file_io.cc:530 +#: file_io.cc:530 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "arquivo ou diretório inexistente: '%s'" @@ -2402,7 +2439,7 @@ msgstr "Diretório '%s' não existe" msgid "Directory '%s' does not exist" msgstr "Diretório '%s' não existe" -#: lua.cc:480 rcs_import.cc:1235 work.cc:1316 +#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "'%s' não é um diretório" @@ -2418,8 +2455,8 @@ msgstr "resolva os conflitos que não sà msgstr "resolva os conflitos que não são de conteúdo e tente de novo" #: merge.cc:124 -#, c-format -msgid "merge failed due to unresolved conflicts\n" +#, fuzzy, c-format +msgid "merge failed due to unresolved conflicts" msgstr "a combinação falhou devido a conflitos não resolvidos\n" #: merkle_tree.cc:290 @@ -2432,27 +2469,12 @@ msgstr "valor do hash do nó %s errado, msgid "mismatched node hash value %s, expected %s" msgstr "valor do hash do nó %s errado, %s esperado" -#: monotone.cc:153 +#: monotone.cc:274 #, c-format -msgid "Invalid escape in --xargs file" -msgstr "Código de escape inválido em arquivo passado a --xargs" - -#: monotone.cc:665 -#, c-format -msgid "%s:\n" -msgstr "%s:\n" - -#: monotone.cc:673 -#, c-format -msgid "%s" -msgstr "%s" - -#: monotone.cc:683 -#, c-format msgid "Usage: %s [OPTION...] command [ARG...]" msgstr "Uso: %s [OPÇÃO...] comando [ARG...]" -#: monotone.cc:691 +#: monotone.cc:282 #, c-format msgid "Options specific to '%s %s':" msgstr "Opções específicas para '%s %s':" @@ -2512,10 +2534,10 @@ msgstr "conteúdo do pacote com um taman msgstr "conteúdo do pacote com um tamanho maior de '%d' bytes" #: netcmd.cc:176 -#, c-format +#, fuzzy, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" -"this suggests data was corrupted in transit\n" +"this suggests data was corrupted in transit" msgstr "" "verificação HMAC errada (obti %s, queria %s)\n" "isto sugere que dados foram corrompidos em trânsito\n" @@ -2620,11 +2642,11 @@ msgstr "a chave do servidor mudou" msgstr "a chave do servidor mudou" #: netsync.cc:1251 -#, c-format +#, fuzzy, c-format msgid "" "first time connecting to server %s\n" "I'll assume it's really them, but you might want to double-check\n" -"their key's fingerprint: %s\n" +"their key's fingerprint: %s" msgstr "" "primeira vez conectando ao servidor %s\n" "vou supor que é mesmo ele, mas você pode querer verificar\n" @@ -2747,417 +2769,441 @@ msgstr "%s com hash '%s' não existe no msgid "%s with hash '%s' does not exist in our database" msgstr "%s com hash '%s' não existe no banco de dados" -#: netsync.cc:1857 +#: netsync.cc:1859 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "Épocas não combinam no ramo %s. Servidor tem '%s', cliente tem '%s'." -#: netsync.cc:1875 +#: netsync.cc:1877 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "" "teste de hash falhou para chave pública '%s' (%s);\n" "esperado '%s', recebido '%s'" -#: netsync.cc:1889 +#: netsync.cc:1891 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "verificação do hash falhou para o certificado '%s' da versão" -#: netsync.cc:1951 +#: netsync.cc:1953 #, c-format msgid "Received warning from usher: %s" msgstr "Recebido aviso do usher: %s" -#: netsync.cc:2038 netsync.cc:2069 +#: netsync.cc:2040 netsync.cc:2071 msgid "source and sink" msgstr "entrada e saída" -#: netsync.cc:2039 netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "source" msgstr "entrada" -#: netsync.cc:2039 netsync.cc:2070 +#: netsync.cc:2041 netsync.cc:2072 msgid "sink" msgstr "saída" -#: netsync.cc:2226 -#, c-format -msgid "input buffer for peer %s is overfull after netcmd dispatch\n" +#: netsync.cc:2228 +#, fuzzy, c-format +msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "" "buffer de entrada do par %s está cheio após despacho de comando de rede\n" -#: netsync.cc:2238 netsync.cc:2337 +#: netsync.cc:2240 netsync.cc:2339 #, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "erro de protocolo durante processamento do par %s: '%s'" -#: netsync.cc:2244 +#: netsync.cc:2246 #, c-format msgid "error: %s" msgstr "erro: %s" -#: netsync.cc:2308 +#: netsync.cc:2310 #, c-format msgid "connecting to %s" msgstr "conectando a %s" -#: netsync.cc:2352 -#, c-format -msgid "timed out waiting for I/O with peer %s, disconnecting\n" +#: netsync.cc:2354 +#, fuzzy, c-format +msgid "timed out waiting for I/O with peer %s, disconnecting" msgstr "tempo expirou esperando por E/S com par %s, desconectando\n" -#: netsync.cc:2375 -#, c-format -msgid "processing failure while talking to peer %s, disconnecting\n" +#: netsync.cc:2377 +#, fuzzy, c-format +msgid "processing failure while talking to peer %s, disconnecting" msgstr "erro de processamento durante comunicação com par %s, desconectando\n" -#: netsync.cc:2392 +#: netsync.cc:2394 #, c-format msgid "successful exchange with %s" msgstr "comunicação feita com sucesso com %s" -#: netsync.cc:2398 +#: netsync.cc:2400 #, c-format msgid "peer %s disconnected after we informed them of error" msgstr "par %s desconectou após nós o termos informado de um erro" -#: netsync.cc:2403 -#, c-format -msgid "I/O failure while talking to peer %s, disconnecting\n" +#: netsync.cc:2405 +#, fuzzy, c-format +msgid "I/O failure while talking to peer %s, disconnecting" msgstr "erro de E/S comunicando com par %s, desconectando\n" -#: netsync.cc:2469 +#: netsync.cc:2471 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" msgstr "erro de protocolo processando par %s: '%s', marcado como inválido" -#: netsync.cc:2501 +#: netsync.cc:2503 #, c-format msgid "accepted new client connection from %s : %s" msgstr "nova conexão do cliente %s aceita: %s" -#: netsync.cc:2538 +#: netsync.cc:2540 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" msgstr "" "erro do protocolo durante o processamento do par %s:\n" "'%s', desconectando" -#: netsync.cc:2549 +#: netsync.cc:2551 #, c-format msgid "peer %s read failed in working state (error)" msgstr "leitura do par %s falhou no estado trabalhando (erro)" -#: netsync.cc:2554 -#, c-format +#: netsync.cc:2556 +#, fuzzy, c-format msgid "" -"peer %s read failed in shutdown state (possibly client misreported error)\n" +"peer %s read failed in shutdown state (possibly client misreported error)" msgstr "" "leitura do par %s falhou no estado de encerramento (provavelmente o\n" "cliente reportou o erro erroneamente)\n" -#: netsync.cc:2560 +#: netsync.cc:2562 #, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "leitura do par %s falhou no estado confirmado (sucesso)" -#: netsync.cc:2581 +#: netsync.cc:2583 #, c-format msgid "peer %s write failed in working state (error)" msgstr "escrita no par %s falhou no estado trabalhando (erro)" -#: netsync.cc:2586 -#, c-format +#: netsync.cc:2588 +#, fuzzy, c-format msgid "" -"peer %s write failed in shutdown state (possibly client misreported error)\n" +"peer %s write failed in shutdown state (possibly client misreported error)" msgstr "" "escrita no par %s falhou no estado de encerramento (provavelmente o\n" "cliente reportou o erro erroneamente)\n" -#: netsync.cc:2592 +#: netsync.cc:2594 #, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "escrita no par %s falhou em um estado confirmado (sucesso)" -#: netsync.cc:2619 +#: netsync.cc:2621 #, c-format msgid "peer %s processing finished, disconnecting" msgstr "processamento do par %s terminou, desconectando" -#: netsync.cc:2641 +#: netsync.cc:2643 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting" msgstr "fd %d (par %s) tem estado parado por muito tempo, desconectando" -#: netsync.cc:2709 +#: netsync.cc:2711 #, c-format msgid "beginning service on %s : %s" msgstr "iniciando serviço em %s : %s" -#: netsync.cc:2710 +#: netsync.cc:2712 msgid "" msgstr "" -#: netsync.cc:2724 -#, c-format -msgid "session limit %d reached, some connections will be refused\n" +#: netsync.cc:2726 +#, fuzzy, c-format +msgid "session limit %d reached, some connections will be refused" msgstr "limite %d da sessão alcançado, algumas conexões serão recusadas\n" -#: netsync.cc:2789 +#: netsync.cc:2791 #, c-format msgid "got OOB from peer %s, disconnecting" msgstr "recebido OOB do par %s, desconectando" -#: netsync.cc:2849 +#: netsync.cc:2851 #, c-format msgid "beginning service on %s" msgstr "iniciando serviço em %s" -#: netsync.cc:2912 +#: netsync.cc:2914 #, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting" msgstr "recebidos alguns dados OOB no fd %d (par %s), desconectando" -#: netsync.cc:2961 +#: netsync.cc:2963 #, c-format msgid "finding items to synchronize:" msgstr "encontrando itens para sincronizar:" -#: netsync.cc:2969 +#: netsync.cc:2971 msgid "certificates" msgstr "certificados" -#: netsync.cc:3082 +#: netsync.cc:3084 #, c-format msgid "Cannot find key '%s'" msgstr "Impossível achar chave '%s'" -#: netsync.cc:3122 -#, c-format +#: netsync.cc:3124 +#, fuzzy, c-format msgid "" "include branch pattern contains a quote character:\n" -"%s\n" +"%s" msgstr "" "padrão de inclusão de ramos contém um caractere de aspas:\n" "%s\n" -#: netsync.cc:3128 -#, c-format +#: netsync.cc:3130 +#, fuzzy, c-format msgid "" "exclude branch pattern contains a quote character:\n" -"%s\n" +"%s" msgstr "" "padrão de exclusão de ramos contém um caractere de aspas:\n" "%s\n" -#: netsync.cc:3163 netsync.cc:3167 +#: netsync.cc:3165 netsync.cc:3169 #, c-format msgid "network error: %s" msgstr "erro de rede: %s" -#: options_list.hh:2 -msgid "print debug log to stderr while running" -msgstr "" -"envia registros de depuração para saída padrão de erro\n" -"quando em execução" - -#: options_list.hh:3 -msgid "file to dump debugging log to, on failure" -msgstr "arquivo onde gravar registros de depuração, em caso de falha" - -#: options_list.hh:4 -msgid "file to write the log to" -msgstr "arquivo onde registro será escrito" - -#: options_list.hh:5 -msgid "suppress verbose, informational and progress messages" -msgstr "suprime mensagens detalhadas, informativas e de progresso" - -#: options_list.hh:6 -msgid "suppress warning, verbose, informational and progress messages" -msgstr "suprime mensagens de aviso, detalhadas, informativas e de progresso" - -#: options_list.hh:7 -msgid "display help message" -msgstr "exibe mensagem de ajuda" - -#: options_list.hh:8 -msgid "print version number, then exit" -msgstr "exibe número de versão e sai" - -#: options_list.hh:9 -msgid "print detailed version number, then exit" -msgstr "exibe número de versão detalhado e sai" - -#: options_list.hh:10 -msgid "insert command line arguments taken from the given file" -msgstr "insere argumentos de linha de comando retirados do arquivo dado" - -#: options_list.hh:11 -msgid "set ticker style (count|dot|none)" -msgstr "configura estilo do contador (count|dot|none)" - -#: options_list.hh:12 -msgid "do not load standard lua hooks" -msgstr "não carrega hooks Lua padrão" - -#: options_list.hh:13 -msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" -msgstr "não carrega arquivos Lua ~/.monotone/monotonerc ou _MTN/monotonerc" - -#: options_list.hh:14 -msgid "load extra rc file" -msgstr "carrega arquivo Lua extra" - -#: options_list.hh:15 -msgid "set key for signatures" -msgstr "configura a chave para assinaturas" - -#: options_list.hh:16 -msgid "set name of database" -msgstr "configura nome do banco de dados" - -#: options_list.hh:17 -msgid "limit search for workspace to specified root" -msgstr "limita a procura por uma área de trabalho à raiz especificada" - -#: options_list.hh:18 -msgid "verbose completion output" -msgstr "saída mais detalhada" - #: options_list.hh:19 -msgid "set location of key store" -msgstr "configura localização da coleção de chaves" - -#: options_list.hh:20 -msgid "set location of configuration directory" -msgstr "configura localização do diretório de configuração" - -#: options_list.hh:22 msgid "override author for commit" msgstr "sobrescreve autor da gravação" -#: options_list.hh:23 +#: options_list.hh:27 msgid "block size in bytes for \"automate stdio\" output" msgstr "tamanho do bloco em bytes para saída de \"automate stdio\"" -#: options_list.hh:24 +#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#, fuzzy, c-format +msgid "cannot be zero or negative" +msgstr "argumento ilegal para --last: não pode ser zero ou negativo\n" + +#: options_list.hh:43 msgid "address:port to listen on (default :4691)" msgstr "endereço:porta onde conexões serão esperadas (padrão :4691)" -#: options_list.hh:25 +#: options_list.hh:80 +msgid "disable transport authentication" +msgstr "desabilita a autenticação do transporte" + +#: options_list.hh:87 +msgid "serve netsync on stdio" +msgstr "serve netsync na saída padrão" + +#: options_list.hh:96 msgid "select branch cert for operation" msgstr "seleciona o certificado de ramo para a operação" -#: options_list.hh:26 +#: options_list.hh:104 msgid "print a brief version of the normal output" msgstr "exibe uma versão resumida da saída normal" -#: options_list.hh:27 -msgid "use context diff format" -msgstr "usa formato de contexto de diff" +#: options_list.hh:112 +msgid "set location of configuration directory" +msgstr "configura localização do diretório de configuração" -#: options_list.hh:28 +#: options_list.hh:122 msgid "override date/time for commit" msgstr "sobrescreve data/hora da gravação" -#: options_list.hh:29 +#: options_list.hh:143 +msgid "set name of database" +msgstr "configura nome do banco de dados" + +#: options_list.hh:151 +msgid "print debug log to stderr while running" +msgstr "" +"envia registros de depuração para saída padrão de erro\n" +"quando em execução" + +#: options_list.hh:159 msgid "limit the number of levels of directories to descend" msgstr "limita o número de níveis de diretório a descer" -#: options_list.hh:30 +#: options_list.hh:164 +#, c-format +msgid "cannot be negative" +msgstr "" + +#: options_list.hh:173 +msgid "argument to pass external diff hook" +msgstr "argumento para passar para o hook de diff externo" + +#: options_list.hh:182 +msgid "use context diff format" +msgstr "usa formato de contexto de diff" + +#: options_list.hh:189 +msgid "use external diff hook for generating diffs" +msgstr "usa hook de diff externo para gerar diferenças" + +#: options_list.hh:196 +msgid "use unified diff format" +msgstr "usa formato diff unificado" + +#: options_list.hh:204 +msgid "do not show the function containing each block of changes" +msgstr "não mostra a função contendo cada bloco de mudanças" + +#: options_list.hh:211 msgid "print diffs along with logs" msgstr "exibe diferenças junto com os registros" -#: options_list.hh:31 +#: options_list.hh:220 msgid "when rosterifying, drop attrs entries with the given key" msgstr "quando criando inventórios, descarta atributos com a chave dada" -#: options_list.hh:32 +#: options_list.hh:228 +msgid "file to dump debugging log to, on failure" +msgstr "arquivo onde gravar registros de depuração, em caso de falha" + +#: options_list.hh:237 msgid "leave out anything described by its argument" msgstr "exclui qualquer coisa descrita pelo seu argumento" -#: options_list.hh:33 +#: options_list.hh:245 msgid "perform the associated file operation" msgstr "executa a operação associada ao arquivo" -#: options_list.hh:34 -msgid "use external diff hook for generating diffs" -msgstr "usa hook de diff externo para gerar diferenças" +#: options_list.hh:253 +msgid "print detailed version number, then exit" +msgstr "exibe número de versão detalhado e sai" -#: options_list.hh:35 -msgid "argument to pass external diff hook" -msgstr "argumento para passar para o hook de diff externo" +#: options_list.hh:260 +msgid "display help message" +msgstr "exibe mensagem de ajuda" -#: options_list.hh:36 +#: options_list.hh:269 +#, fuzzy +msgid "include anything described by its argument" +msgstr "exclui qualquer coisa descrita pelo seu argumento" + +#: options_list.hh:277 +msgid "set key for signatures" +msgstr "configura a chave para assinaturas" + +#: options_list.hh:285 +msgid "set location of key store" +msgstr "configura localização da coleção de chaves" + +#: options_list.hh:294 msgid "push the specified key even if it hasn't signed anything" msgstr "envia a chave especificada mesmo se ela não assinou nada" -#: options_list.hh:37 +#: options_list.hh:304 msgid "limit log output to the last number of entries" msgstr "limita a saída de registros para o último número de itens" -#: options_list.hh:38 +#: options_list.hh:313 +msgid "file to write the log to" +msgstr "arquivo onde registro será escrito" + +#: options_list.hh:324 msgid "set commit changelog message" msgstr "informa a mensagem de gravação" -#: options_list.hh:39 -msgid "perform the operations for files missing from workspace" -msgstr "faz as operações para arquivos desaparecidos da área de trabalho" - -#: options_list.hh:40 +#: options_list.hh:331 msgid "set filename containing commit changelog message" msgstr "informa o arquivo que contém a mensagem de gravação" -#: options_list.hh:41 +#: options_list.hh:339 +msgid "perform the operations for files missing from workspace" +msgstr "faz as operações para arquivos desaparecidos da área de trabalho" + +#: options_list.hh:347 msgid "limit log output to the next number of entries" msgstr "limita a saída de registros para o próximo número de itens" -#: options_list.hh:42 +#: options_list.hh:357 msgid "exclude files when printing logs" msgstr "exclui arquivos quando imprime os registros" -#: options_list.hh:43 +#: options_list.hh:365 +msgid "do not ignore any files" +msgstr "" + +#: options_list.hh:373 msgid "exclude merges when printing logs" msgstr "exclui combinações quando exibe os registros" -#: options_list.hh:44 -msgid "do not show the function containing each block of changes" -msgstr "não mostra a função contendo cada bloco de mudanças" +#: options_list.hh:381 +msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" +msgstr "não carrega arquivos Lua ~/.monotone/monotonerc ou _MTN/monotonerc" -#: options_list.hh:45 -msgid "disable transport authentication" -msgstr "desabilita a autenticação do transporte" +#: options_list.hh:389 +msgid "do not load standard lua hooks" +msgstr "não carrega hooks Lua padrão" -#: options_list.hh:46 +#: options_list.hh:397 msgid "record process id of server" msgstr "grava o ID do processo do servidor" -#: options_list.hh:47 +#: options_list.hh:405 +msgid "suppress verbose, informational and progress messages" +msgstr "suprime mensagens detalhadas, informativas e de progresso" + +#: options_list.hh:415 +msgid "load extra rc file" +msgstr "carrega arquivo Lua extra" + +#: options_list.hh:423 +msgid "suppress warning, verbose, informational and progress messages" +msgstr "suprime mensagens de aviso, detalhadas, informativas e de progresso" + +#: options_list.hh:433 msgid "also operate on the contents of any listed directories" msgstr "também opera nos conteúdos de quaisquer diretórios listados" -#: options_list.hh:48 +#: options_list.hh:442 msgid "select revision id for operation" msgstr "seleciona ID da versão para operação" -#: options_list.hh:49 +#: options_list.hh:450 +msgid "limit search for workspace to specified root" +msgstr "limita a procura por uma área de trabalho à raiz especificada" + +#: options_list.hh:458 msgid "use the current arguments as the future default" msgstr "usa os argumentos atuais como futuros padrões" -#: options_list.hh:50 -msgid "serve netsync on stdio" -msgstr "serve netsync na saída padrão" +#: options_list.hh:466 +msgid "set ticker style (count|dot|none)" +msgstr "configura estilo do contador (count|dot|none)" -#: options_list.hh:51 -msgid "use unified diff format" -msgstr "usa formato diff unificado" +#: options_list.hh:477 +#, c-format +msgid "argument must be 'none', 'dot', or 'count'" +msgstr "" -#: options_list.hh:52 +#: options_list.hh:482 msgid "perform the operations for unknown files from workspace" msgstr "faz as operações para arquivos desconhecidos da área de trabalho" +#: options_list.hh:490 +msgid "verbose completion output" +msgstr "saída mais detalhada" + +#: options_list.hh:498 +msgid "print version number, then exit" +msgstr "exibe número de versão e sai" + +#: options_list.hh:506 +msgid "insert command line arguments taken from the given file" +msgstr "insere argumentos de linha de comando retirados do arquivo dado" + #: packet.cc:107 #, c-format msgid "file preimage '%s' missing in db" @@ -3219,18 +3265,18 @@ msgstr "tipo de pacote desconhecido: '%s msgstr "tipo de pacote desconhecido: '%s'" #: rcs_file.cc:354 -#, c-format -msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" +#, fuzzy, c-format +msgid "parse failure %d:%d: expecting %s, got %s with value '%s'" msgstr "falha de leitura %d:%d: esperando %s, veio %s com valor '%s'\n" #: rcs_file.cc:373 -#, c-format -msgid "parse failure %d:%d: expecting word '%s'\n" +#, fuzzy, c-format +msgid "parse failure %d:%d: expecting word '%s'" msgstr "falha de leitura %d:%d: palavra '%s' esperada\n" #: rcs_file.cc:388 -#, c-format -msgid "parse failure %d:%d: expecting word\n" +#, fuzzy, c-format +msgid "parse failure %d:%d: expecting word" msgstr "falha de leitura %d:%d: palavra esperada\n" #: rcs_import.cc:721 @@ -3271,49 +3317,49 @@ msgstr "etiquetas" msgid "tags" msgstr "etiquetas" -#: revision.cc:865 +#: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" msgstr "procurando por falsas arestas da combinação" -#: revision.cc:907 +#: revision.cc:883 #, c-format msgid "optimizing out redundant edge %d -> %d" msgstr "removendo aresta redundante %d -> %d" -#: revision.cc:916 +#: revision.cc:892 #, c-format msgid "failed to eliminate edge %d -> %d" msgstr "falha na eliminação da aresta %d -> %d" -#: revision.cc:927 +#: revision.cc:903 #, c-format msgid "rebuilding %d nodes" msgstr "reconstruindo %d nós" -#: revision.cc:1132 -#, c-format -msgid "Path %s added to child roster multiple times\n" +#: revision.cc:1108 +#, fuzzy, c-format +msgid "Path %s added to child roster multiple times" msgstr "Caminho %s adicionado ao inventório-filho múltiplas vezes\n" -#: revision.cc:1145 -#, c-format -msgid "Directory for path %s cannot be added, as there is a file in the way\n" +#: revision.cc:1121 +#, fuzzy, c-format +msgid "Directory for path %s cannot be added, as there is a file in the way" msgstr "" "Diretório com caminho %s não pode ser adicionado, porque há\n" "um arquivo no caminho\n" -#: revision.cc:1156 +#: revision.cc:1132 #, c-format msgid "Path %s cannot be added, as there is a directory in the way" msgstr "Caminho %s não pode ser adicionado, há um diretório no caminho" -#: revision.cc:1159 -#, c-format -msgid "Path %s added twice with differing content\n" +#: revision.cc:1135 +#, fuzzy, c-format +msgid "Path %s added twice with differing content" msgstr "Caminho %s adicionado duas vezes com conteúdos diferentes\n" -#: revision.cc:1446 +#: revision.cc:1422 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3326,32 +3372,37 @@ msgstr "" "(se você apenas quer que isto suma, veja a opção --drop-attr, mas\n" "se você quiser manter o atributo, nós podemos ajudar como)" -#: revision.cc:1559 +#: revision.cc:1535 #, c-format msgid "converting existing revision graph to new roster-style revisions" msgstr "convertendo grafo de versões atual para novo estilo com inventório" -#: revision.cc:1614 +#: revision.cc:1590 #, c-format msgid "rebuilding revision graph from manifest certs" msgstr "reconstruindo grafo de versões a partir dos certificados da listagem" -#: revision.cc:1647 -#, c-format -msgid "regenerating cached rosters" +#: revision.cc:1668 +#, fuzzy, c-format +msgid "regenerating cached rosters and heights" msgstr "gerando novamente inventários em cache" -#: revision.cc:1656 -#, c-format -msgid "calculating rosters to regenerate" -msgstr "calculando inventários que serão gerados de novo" - -#: revision.cc:1660 +#: revision.cc:1680 msgid "regenerated" msgstr "gerado novamente" -#: revision.cc:1755 +#: revision.cc:1696 +#, fuzzy, c-format +msgid "finished regenerating cached rosters and heights" +msgstr "gerando novamente inventários em cache" + +#: revision.cc:1708 #, c-format +msgid "cached height: %s" +msgstr "" + +#: revision.cc:1791 +#, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" "I only know how to understand the version '1' format\n" @@ -3380,13 +3431,13 @@ msgstr "%s:%d: invariante '%s' violada" msgstr "%s:%d: invariante '%s' violada" #: sanity.cc:255 -#, c-format -msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" +#, fuzzy, c-format +msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d" msgstr "%s:%d: índice '%s' = %d estourou vetor '%s' com tamanho %d\n" #: sanity.cc:276 -#, c-format -msgid "Current work set: %i items\n" +#, fuzzy, c-format +msgid "Current work set: %i items" msgstr "Conjunto de trabalho atual: %i itens\n" #: schema_migration.cc:258 @@ -3451,10 +3502,10 @@ msgstr "" "veja o arquivo UPGRADE para instruções sobre executar '%s db %s'" #: schema_migration.cc:339 -#, c-format +#, fuzzy, c-format msgid "" -"NOTE: this upgrade cleared the roster cache\n" -"you should now run '%s db regenerate_rosters'" +"NOTE: this upgrade cleared monotone's caches\n" +"you should now run '%s db regenerate_caches'" msgstr "" "NOTA: esta atualização limpou o cache de inventórios\n" "você deve executar agora '%s db regenerate_rosters'" @@ -3517,28 +3568,28 @@ msgstr "aviso: " msgstr "aviso: " #: ui.cc:477 -#, c-format +#, fuzzy, c-format msgid "" "fatal: %s\n" "this is almost certainly a bug in monotone.\n" "please send this error message, the output of '%s --full-version',\n" -"and a description of what you were doing to %s.\n" +"and a description of what you were doing to %s." msgstr "" "fatal: %s\n" "isto é quase certamente um defeito em monotone.\n" "por favor envie esta mensagem de erro, a saída de '%s --full-version',\n" "e uma descrição do que você estava fazendo para %s.\n" -#: ui.cc:512 -#, c-format -msgid "%s: %s" -msgstr "%s: %s" - #: ui.cc:581 #, c-format msgid "failed to open log file '%s'" msgstr "Erro abrindo arquivo de registro '%s'" +#: uri.cc:63 +#, c-format +msgid "The URI syntax is invalid. Maybe you used an URI in scp-style?" +msgstr "" + #: update.cc:72 #, c-format msgid "failed to decode boolean testresult cert value '%s'" @@ -3614,22 +3665,22 @@ msgstr "Impossível escrever arquivo de msgid "Failed to write options file %s: %s" msgstr "Impossível escrever arquivo de opções %s: %s" -#: work.cc:539 +#: work.cc:541 #, c-format msgid "skipping ignorable file %s" msgstr "pulando arquivo ignorável %s" -#: work.cc:548 +#: work.cc:550 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "pulando %s, já encontrado na área de trabalho" -#: work.cc:559 +#: work.cc:561 #, c-format msgid "adding %s to workspace manifest" msgstr "adicionando %s à lista de arquivos da área de trabalho" -#: work.cc:565 +#: work.cc:567 #, c-format msgid "" "cannot add %s, because %s is recorded as a file in the workspace manifest" @@ -3637,57 +3688,57 @@ msgstr "" "impossível adicionar %s porque %s está gravado como um\n" "arquivo na listagem da área de trabalho" -#: work.cc:680 +#: work.cc:682 #, c-format msgid "dropping %s" msgstr "descartando %s" -#: work.cc:691 work.cc:702 +#: work.cc:693 work.cc:704 #, c-format msgid "path %s already exists" msgstr "caminho '%s' já existe" -#: work.cc:724 work.cc:751 +#: work.cc:726 work.cc:756 #, c-format msgid "adding %s" msgstr "adicionando %s" -#: work.cc:740 +#: work.cc:744 #, c-format msgid "path '%s' already exists, cannot create" msgstr "caminho '%s' já existe, impossível criar" -#: work.cc:747 +#: work.cc:752 #, c-format msgid "renaming %s to %s" msgstr "renomeando %s para %s" -#: work.cc:782 +#: work.cc:787 #, c-format msgid "file '%s' does not exist" msgstr "arquivo '%s' não existe" -#: work.cc:783 +#: work.cc:788 #, c-format msgid "file '%s' is a directory" msgstr "arquivo '%s' é um diretório" -#: work.cc:788 +#: work.cc:793 #, 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:789 +#: work.cc:794 #, c-format msgid "modifying %s" msgstr "modificando %s" -#: work.cc:974 +#: work.cc:979 #, c-format msgid "missing %s" msgstr "%s está faltando" -#: work.cc:980 +#: work.cc:985 #, c-format msgid "" "%d missing files; use '%s ls missing' to view\n" @@ -3706,92 +3757,92 @@ msgstr "" " '%s drop --missing' ou\n" " '%s revert --missing'" -#: work.cc:1113 +#: work.cc:1131 #, c-format msgid "skipping %s, not currently tracked" msgstr "pulando %s, não é versionado atualmente" -#: work.cc:1123 +#: work.cc:1141 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "impossível remover %s/, não está vazio" -#: work.cc:1134 +#: work.cc:1152 #, c-format msgid "dropping %s from workspace manifest" msgstr "removendo %s da listagem da área de trabalho" -#: work.cc:1187 -#, c-format -msgid "destination dir %s/ does not exist in current revision" +#: work.cc:1205 +#, fuzzy, c-format +msgid "destination dir %s/ is not versioned (perhaps add it?)" msgstr "diretório de destino %s/ não existe na versão atual" -#: work.cc:1190 +#: work.cc:1208 #, c-format msgid "destination %s is an existing file in current revision" msgstr "destino %s é um arquivo existente na versão atual" -#: work.cc:1200 +#: work.cc:1218 #, c-format msgid "empty path %s is not allowed" msgstr "caminho vazio %s não permitido" -#: work.cc:1214 +#: work.cc:1232 #, c-format msgid "%s does not exist in current manifest" msgstr "%s não existe na listagem atual" -#: work.cc:1217 +#: work.cc:1235 #, c-format msgid "destination %s already exists in current manifest" msgstr "destino %s já existe na listagem atual" -#: work.cc:1223 +#: work.cc:1241 #, c-format msgid "destination directory %s does not exist in current manifest" msgstr "diretório de destino %s não existe na listagem atual" -#: work.cc:1225 +#: work.cc:1243 #, c-format msgid "destination directory %s is not a directory" msgstr "diretório de destino %s não é um diretório" -#: work.cc:1234 +#: work.cc:1252 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "renomeando %s para %s na listagem da área de trabalho" -#: work.cc:1262 +#: work.cc:1280 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "%s não existe na área de trabalho, pulando" -#: work.cc:1266 +#: work.cc:1284 #, c-format msgid "destination %s already exists in workspace, skipping" msgstr "destino %s já existe na área de trabalho, pulando" -#: work.cc:1296 +#: work.cc:1314 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" msgstr "novo diretório raiz proposto '%s' não está versionado ou não existe" -#: work.cc:1298 +#: work.cc:1316 #, c-format msgid "proposed new root directory '%s' is not a directory" msgstr "novo diretório raiz proposto '%s' não é um diretório" -#: work.cc:1303 +#: work.cc:1321 #, c-format msgid "proposed new root directory '%s' contains illegal path %s" msgstr "novo diretório raiz proposto '%s' contém caminho ilegal %s" -#: work.cc:1313 +#: work.cc:1331 #, c-format msgid "directory '%s' is not versioned or does not exist" msgstr "diretório '%s' não está versionado ou não existe" -#: work.cc:1319 +#: work.cc:1337 #, c-format msgid "'%s' is in the way" msgstr "'%s' está no caminho" @@ -3873,3 +3924,36 @@ msgstr "" msgid "this workspace is in the current format, no migration is necessary." msgstr "" "esta área de trabalho está no formato atual, nenhuma migração é necessária" + +#~ msgid "failed to parse date string '%s': %s" +#~ msgstr "erro lendo string de data '%s': %s" + +#~ msgid "negative depth not allowed\n" +#~ msgstr "profundidade negativa não permitida\n" + +#~ msgid "illegal argument to --next: cannot be zero or negative\n" +#~ msgstr "argumento ilegal para --next: não pode ser zero ou negativo\n" + +#~ msgid "" +#~ "illegal argument to --automate-stdio-size: cannot be zero or negative\n" +#~ msgstr "" +#~ "argumento ilegal para --automate-stdio-size: não pode ser zero ou " +#~ "negativo\n" + +#~ msgid "[DIRECTORY]\n" +#~ msgstr "[DIRETÓRIO]\n" + +#~ msgid "Invalid escape in --xargs file" +#~ msgstr "Código de escape inválido em arquivo passado a --xargs" + +#~ msgid "%s:\n" +#~ msgstr "%s:\n" + +#~ msgid "%s" +#~ msgstr "%s" + +#~ msgid "calculating rosters to regenerate" +#~ msgstr "calculando inventários que serão gerados de novo" + +#~ msgid "%s: %s" +#~ msgstr "%s: %s" ============================================================ --- po/sv.po 897d61be18aba7d6316298fbdc6a385f3e70de51 +++ po/sv.po ddee1f357db8fabf44594c114eee6ac7bed8c2b2 @@ -146,8 +146,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-13 22:21+0100\n" -"PO-Revision-Date: 2006-11-13 22:28+0100\n" +"POT-Creation-Date: 2006-11-14 23:43+0100\n" +"PO-Revision-Date: 2006-11-14 23:45+0100\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -244,9 +244,9 @@ msgstr "REVID" msgstr "REVID" #: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 -#: cmd_db.cc:35 cmd_diff_log.cc:387 cmd_diff_log.cc:418 cmd_diff_log.cc:420 +#: cmd_db.cc:35 cmd_diff_log.cc:386 cmd_diff_log.cc:417 cmd_diff_log.cc:419 #: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 -#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:409 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" @@ -476,9 +476,9 @@ msgstr "det finns inga variabler med nam msgid "no var with name %s in domain %s" msgstr "det finns inga variabler med namnet %s i domänen %s" -#: cmd_db.cc:155 cmd_diff_log.cc:333 cmd_diff_log.cc:559 cmd_files.cc:114 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 #: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 -#: commands.cc:271 +#: commands.cc:275 msgid "informative" msgstr "informativ" @@ -495,12 +495,17 @@ msgstr "nÃ¥got tecken i den partiella id msgid "non-hex digits in partial id" msgstr "nÃ¥got tecken i den partiella identiteten är inte hexadecimalt" -#: cmd_diff_log.cc:333 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 +#: cmd_diff_log.cc:356 +#, c-format +msgid "more than two revisions given" +msgstr "fler än tvÃ¥ revisioner angivna" + +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 #: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[SÖKVÄG]..." -#: cmd_diff_log.cc:334 +#: cmd_diff_log.cc:466 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -512,7 +517,7 @@ msgstr "" "revisionen. Om tvÃ¥ revisioner anges visas skillnaden mellan dem. Om\n" "inget format anges används unified." -#: cmd_diff_log.cc:347 +#: cmd_diff_log.cc:475 #, c-format msgid "" "--diff-args requires --external\n" @@ -521,15 +526,19 @@ msgstr "" "--diff-args kräver att även --external anges\n" "lägg till --external eller ta bort --diff-args?" -#: cmd_diff_log.cc:479 +#: cmd_diff_log.cc:499 msgid "no changes" msgstr "inga ändringar" -#: cmd_diff_log.cc:559 +#: cmd_diff_log.cc:520 +msgid "[FILE [...]]" +msgstr "[FIL [...]]" + +#: cmd_diff_log.cc:603 msgid "[FILE] ..." msgstr "[FIL] ..." -#: cmd_diff_log.cc:560 +#: cmd_diff_log.cc:604 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -538,7 +547,7 @@ msgstr "" "arbetskatalogen om inga filer angivits. Om en eller flera revisioner har " "angivits används de som utgÃ¥ngspunkter." -#: cmd_diff_log.cc:572 +#: cmd_diff_log.cc:616 #, c-format msgid "only one of --last/--next allowed" msgstr "enbart en av --last eller --next tillÃ¥ten" @@ -1763,53 +1772,53 @@ msgstr "uppdatera inodeprint-cachen" msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:135 commands.cc:237 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "okänt kommando '%s'" -#: commands.cc:146 +#: commands.cc:150 #, c-format msgid "command '%s' has multiple ambiguous expansions:" msgstr "kommandot '%s' har mer än en betydelse:" -#: commands.cc:179 +#: commands.cc:183 msgid "commands:" msgstr "kommandon:" -#: commands.cc:271 +#: commands.cc:275 msgid "command [ARGS...]" msgstr "kommandon [ARGUMENT...]" -#: commands.cc:272 +#: commands.cc:276 msgid "display command help" msgstr "skriv ut hjälptext" -#: commands.cc:416 +#: commands.cc:420 #, c-format msgid "expanding selection '%s'" msgstr "expanderar valet '%s'" -#: commands.cc:424 +#: commands.cc:428 #, c-format msgid "no match for selection '%s'" msgstr "det finns inget som matchar '%s'" -#: commands.cc:430 +#: commands.cc:434 #, c-format msgid "expanded to '%s'" msgstr "expanderar till '%s'" -#: commands.cc:447 +#: commands.cc:451 #, c-format msgid "selection '%s' has multiple ambiguous expansions:" msgstr "valet '%s' har mer än en möjlig betydelse:" -#: commands.cc:464 +#: commands.cc:468 msgid "note: " msgstr "obs: " -#: commands.cc:465 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1818,7 +1827,7 @@ msgstr "" "grenen '%s' har mer än ett löv\n" "du kanske borde överväga '%s merge'" -#: commands.cc:480 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message och --message-file fÃ¥r inte anges samtidigt" @@ -2101,7 +2110,9 @@ msgid "" msgid "" "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs; %d " "heights" -msgstr "kontroll klar: %d filer; %d listor; %d revisioner; %d nycklar; %d cert; %d höjder" +msgstr "" +"kontroll klar: %d filer; %d listor; %d revisioner; %d nycklar; %d cert; %d " +"höjder" #: database_check.cc:1024 #, c-format