# # # patch "po/es.po" # from [e17bfb5cbee44534a142dacc478522808f8b3e8e] # to [3ccc9a1029d96a3a7b98dd7ec30cf48ab200b6f0] # # patch "po/fr.po" # from [c7f466da52c97eee89a2c0fc1f187ebdd63fbb42] # to [7837e341823decadddae131fd0fbfaa920cc428e] # # patch "po/it.po" # from [3e7df086f5ded8f102e24e476e09d5b077532dec] # to [52c5dbefd1dafeeee8e1e1ea53d76bee4dede67e] # # patch "po/ja.po" # from [9e1b79176947ef21a6eefc5f645440f8e2b9e94d] # to [6ce6f16773523b6b303d32c39a6a56a321444100] # # patch "po/pt_BR.po" # from [ccff69e42d620c1b0ca5e40023ab6b8b8f112324] # to [8d7d9283bbdb00e6a75564be748bc29844275fa8] # # patch "po/sv.po" # from [0c2a66928b0538cae02268b3fe93de9d70f9c138] # to [451924b3469f47dce87f8121b6b0132fd164d465] # ============================================================ --- po/es.po e17bfb5cbee44534a142dacc478522808f8b3e8e +++ po/es.po 3ccc9a1029d96a3a7b98dd7ec30cf48ab200b6f0 @@ -57,7 +57,7 @@ msgstr "" msgstr "" "Project-Id-Version: Monotone\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-14 23:43+0100\n" +"POT-Creation-Date: 2006-12-15 00:27+0100\n" "PO-Revision-Date: 2006-11-18 17:58-0400\n" "Last-Translator: Nicolas Ruiz \n" "Language-Team: \n" @@ -96,13 +96,23 @@ msgstr "[RAMA]" msgid "[BRANCH]" msgstr "[RAMA]" -#: automate.cc:88 automate.cc:135 automate.cc:1206 +#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218 +#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529 +#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098 +#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297 +#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559 +#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656 +#, c-format +msgid "wrong argument count" +msgstr "" + +#: automate.cc:88 automate.cc:135 automate.cc:1183 msgid "REV1 [REV2 [REV3 [...]]]" 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 revision.cc:1705 +#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454 +#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "La revisión %s no existe" @@ -124,96 +134,99 @@ 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 revision.cc:1699 +#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942 +#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332 +#: cmd_list.cc:564 +#, c-format +msgid "no arguments needed" +msgstr "" + +#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699 msgid "REV" msgstr "REV" -#: automate.cc:524 +#: automate.cc:526 msgid "SELECTOR" msgstr "SELECTOR" -#: automate.cc:893 automate.cc:1023 +#: automate.cc:895 automate.cc:1025 msgid "[REVID]" msgstr "[ID_REV]" -#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 -#: automate.cc:1593 +#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566 +#: automate.cc:1571 #, c-format msgid "no revision %s found in database" msgstr "no se encontró una revisión %s en la base de datos" -#: automate.cc:1066 automate.cc:1145 -msgid "FILEID" -msgstr "ID_ARCHIVO" - -#: automate.cc:1073 -#, c-format -msgid "no file version %s found in database" -msgstr "no se encontró un archivo versión %s en la base de datos" - -#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845 +#: automate.cc:1069 automate.cc:1095 cmd_merging.cc:845 msgid "REVID" msgstr "ID_REV" -#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163 #: 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 +#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535 +#: cmd_ws_commit.cc:1023 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "la revisión '%s' no existe" -#: automate.cc:1156 +#: automate.cc:1122 cmd_files.cc:250 +msgid "FILEID" +msgstr "ID_ARCHIVO" + +#: automate.cc:1133 #, c-format msgid "no such file '%s'" msgstr "archivo '%s' no existe" -#: automate.cc:1172 +#: automate.cc:1149 msgid "OLD_FILE NEW_FILE" msgstr "ARCHIVO_VIEJO ARCHIVO_NUEVO" -#: automate.cc:1317 +#: automate.cc:1294 msgid "[BRANCH_PATTERN]" msgstr "[PATRÓN_RAMO]" -#: automate.cc:1413 +#: automate.cc:1391 msgid "KEYID PASSPHRASE" msgstr "ID_LLAVE FRASE_CLAVE" -#: automate.cc:1431 cmd_key_cert.cc:42 +#: automate.cc:1409 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "llave '%s' ya existe" -#: automate.cc:1434 cmd_key_cert.cc:45 +#: automate.cc:1412 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "generando el par de llaves '%s'" -#: automate.cc:1436 cmd_key_cert.cc:47 +#: automate.cc:1414 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "guardando el par de llaves '%s' en %s/" -#: automate.cc:1472 +#: automate.cc:1450 msgid "OPTION" msgstr "OPCIÓN" -#: automate.cc:1495 +#: automate.cc:1473 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' no es una opción reconocida para el área de trabajo" -#: automate.cc:1518 +#: automate.cc:1496 msgid "REV FILE" msgstr "REV ARCHIVO" -#: automate.cc:1535 automate.cc:1599 +#: automate.cc:1513 automate.cc:1577 #, c-format msgid "file %s is unknown for revision %s" msgstr "el archivo %s es desconocido para la revisión %s" -#: automate.cc:1578 +#: automate.cc:1556 msgid "REV1 FILE REV2" msgstr "REV1 ARCHIVO REV2" @@ -292,30 +305,39 @@ msgstr "" msgid "" "multiple branch certs found for revision %s, please provide a branch name" msgstr "" -"se encontraron múltiples certificados de ramas para la revisión %s, por favor " -"indique un nombre de rama" +"se encontraron múltiples certificados de ramas para la revisión %s, por " +"favor indique un nombre de rama" -#: 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 inválido para 'automate stdio'" +#: cmd_automate.cc:150 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected ':' after string size" +msgstr "Input inválido a 'automate stdio (EOF inesperado)" -#: cmd_automate.cc:168 -#, c-format -msgid "read from client failed with error code: %d" -msgstr "lectura del cliente falló con código de error: %d" +#: cmd_automate.cc:169 +#, fuzzy, c-format +msgid "Bad input to automate stdio: unexpected EOF" +msgstr "Input inválido a 'automate stdio (EOF inesperado)" -#: cmd_automate.cc:169 -#, c-format -msgid "Bad input to automate stdio (unexpected EOF)" +#: cmd_automate.cc:197 +#, fuzzy, c-format +msgid "Bad input to automate stdio: unknown start token '%c'" msgstr "Input inválido a 'automate stdio (EOF inesperado)" -#: cmd_automate.cc:365 +#: cmd_automate.cc:219 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected '%c' token" +msgstr "Input inválido a 'automate stdio (EOF inesperado)" + +#: cmd_automate.cc:344 +#, fuzzy, c-format +msgid "Bad input to automate stdio: command name is missing" +msgstr "Input inválido para 'automate stdio'" + +#: cmd_automate.cc:373 msgid "automation" msgstr "automatización" -#: cmd_automate.cc:366 +#: cmd_automate.cc:374 msgid "automation interface" msgstr "interface de automatización" @@ -399,7 +421,7 @@ msgstr "ninguna variable tiene nombre %s msgstr "ninguna variable tiene nombre %s en el dominino %s" #: 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 +#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429 #: commands.cc:275 msgid "informative" msgstr "informativo" @@ -422,8 +444,8 @@ msgstr "se indicaron más de dos revisio msgid "more than two revisions given" msgstr "se indicaron más de dos revisiones" -#: 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 +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 +#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735 msgid "[PATH]..." msgstr "[CAMINO]..." @@ -469,7 +491,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:616 +#: cmd_diff_log.cc:617 #, c-format msgid "only one of --last/--next allowed" msgstr "solo se permite una de las opciones --last/--next" @@ -560,19 +582,24 @@ msgstr "calcula la identidad de un CAMIN msgid "calculate identity of PATH or stdin" msgstr "calcula la identidad de un CAMINO o stdin" -#: cmd_files.cc:182 +#: cmd_files.cc:185 +#, c-format +msgid "no file version %s found in database" +msgstr "no se encontró un archivo versión %s en la base de datos" + +#: cmd_files.cc:210 cmd_files.cc:214 +#, c-format +msgid "no file '%s' found in revision '%s'" +msgstr "no se encontró un archivo '%s' en la revisión '%s'" + +#: cmd_files.cc:221 cmd_files.cc:273 msgid "FILENAME" msgstr "NOMBRE_ARCHIVO" -#: cmd_files.cc:183 +#: cmd_files.cc:222 msgid "write file from database to stdout" msgstr "copia archivo de la base de datos a stdout" -#: cmd_files.cc:212 cmd_files.cc:214 -#, c-format -msgid "no file '%s' found in revision '%s'" -msgstr "no se encontró un archivo '%s' en la revisión '%s'" - #: cmd.hh:89 #, c-format msgid "non-hex digits in id" @@ -698,7 +725,7 @@ msgstr "NO confiable" msgstr "NO confiable" #: 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 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202 msgid "review" msgstr "verifica" @@ -718,7 +745,7 @@ msgstr "anota los resultados de correr u msgid "note the results of running a test on a revision" msgstr "anota los resultados de correr un test sobre una versión" -#: cmd_key_cert.cc:223 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202 msgid "REVISION" msgstr "REVISIÓN" @@ -749,7 +776,7 @@ msgstr "comentario vacio" msgid "empty comment" msgstr "comentario vacio" -#: cmd_list.cc:64 cmd_list.cc:676 +#: cmd_list.cc:64 cmd_list.cc:677 #, c-format msgid "no public key '%s' found in database" msgstr "llave pública '%s' no se encontró en la base de datos" @@ -835,9 +862,10 @@ msgstr "" "trabajo actual, o archivos conocidos, desconocidos, intencionalmente\n" "ignorados, faltantes, o que han cambiado de estado" -#: 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 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349 +#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635 +#: cmd_ws_commit.cc:735 msgid "workspace" msgstr "área de trabajo" @@ -957,8 +985,8 @@ msgstr "[merged] %s" msgstr "[merged] %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:439 cmd_ws_commit.cc:925 -#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 +#: cmd_merging.cc:821 cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 +#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119 msgid "tree" msgstr "árbol" @@ -972,7 +1000,7 @@ msgstr "por favor especifice una rama, c msgstr "por favor especifice una rama, con --branch=RAMA" #: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 -#: cmd_ws_commit.cc:463 +#: cmd_ws_commit.cc:519 #, c-format msgid "branch '%s' is empty" msgstr "rama '%s' está vacia" @@ -1207,91 +1235,83 @@ msgstr "descarga el roster asociado con msgid "dump the roster associated with the given REVID" msgstr "descarga el roster asociado con el ID_REVISIÓN dado" -#: cmd_netsync.cc:43 +#: cmd_netsync.cc:33 #, c-format msgid "setting default server to %s" msgstr "configurando el servidor por omisión a %s" -#: cmd_netsync.cc:49 +#: cmd_netsync.cc:40 #, c-format -msgid "no hostname given" -msgstr "no se ha especificado nombre de host" - -#: cmd_netsync.cc:51 -#, c-format msgid "no server given and no default server set" msgstr "" "no se ha especificado un servidor y no se ha configurado un servidor por " "omisión" -#: cmd_netsync.cc:79 cmd_netsync.cc:101 +#: cmd_netsync.cc:72 #, c-format msgid "no branch pattern given" msgstr "no se ha dado un patrón de rama" -#: cmd_netsync.cc:88 +#: cmd_netsync.cc:80 #, c-format msgid "setting default branch include pattern to '%s'" msgstr "configurando el patrón por omisión de inclusión de rama a '%s'" -#: cmd_netsync.cc:95 +#: cmd_netsync.cc:86 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "configurando el patrón por omisión de exclusión de rama a '%s'" -#: cmd_netsync.cc:103 +#: cmd_netsync.cc:93 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "" "no se ha especificado un patrón de rama y no se ha configurado un patrón por " "omisión" -#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184 msgid "network" msgstr "red" -#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[DIRECCIÓN[:NÚMERO_PUERTO] [PATRÓN]]" -#: cmd_netsync.cc:120 +#: cmd_netsync.cc:110 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "envia ramas que corresponden a PATRÓN al servidor netsync en DIRECCIÓN" -#: cmd_netsync.cc:133 +#: cmd_netsync.cc:124 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "hala ramas que corresponden a PATRÓN del servidor netsync en DIRECCIÓN" -#: cmd_netsync.cc:141 +#: cmd_netsync.cc:132 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "halando anonimamente; use -kNOMBRE_LLAVE si necesita autenticación" -#: cmd_netsync.cc:148 +#: cmd_netsync.cc:139 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" "sincroniza ramas que concuerden con PATRÓN con servidor netsync en DIRECCIÓN" -#: cmd_netsync.cc:167 +#: cmd_netsync.cc:160 #, c-format msgid "pid file '%s' already exists" msgstr "el archivo pid '%s' ya existe" -#: cmd_netsync.cc:169 +#: cmd_netsync.cc:162 #, c-format msgid "failed to create pid file '%s'" msgstr "creación del archivo pid '%s' falló" -#: cmd_netsync.cc:191 -msgid "PATTERN ..." -msgstr "PATRÓN ..." - -#: cmd_netsync.cc:192 -msgid "serve the branches specified by PATTERNs to connecting clients" +#: cmd_netsync.cc:185 +#, fuzzy +msgid "serve the database to connecting clients" msgstr "" "sirve las ramas especificadas por PATRONes a los clientes que se conectan" -#: cmd_netsync.cc:208 +#: cmd_netsync.cc:201 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1299,7 +1319,7 @@ msgstr "" "necesita permisos para guardar persistentemente la frase clave (vea el hook " "persist_phrase_ok())" -#: cmd_netsync.cc:214 +#: cmd_netsync.cc:207 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1381,7 +1401,11 @@ msgstr[1] "lee %d paquetes" msgstr[0] "lee %d paquete" msgstr[1] "lee %d paquetes" -#: cmd_ws_commit.cc:45 +#: cmd_ws_commit.cc:43 +msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" +msgstr "" + +#: cmd_ws_commit.cc:46 msgid "" "Enter a description of this change.\n" "Lines beginning with `MTN:' are removed automatically." @@ -1389,75 +1413,101 @@ msgstr "" "Entre una descripción de este cambio.\n" "Lineas que comienzan con `MTN:' son removidas automáticamente." -#: cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:71 #, c-format msgid "edit of log message failed" msgstr "edición de mensaje de bitácora falló" -#: cmd_ws_commit.cc:67 +#: cmd_ws_commit.cc:74 +#, fuzzy, c-format +msgid "failed to remove magic line; commit cancelled" +msgstr "mensaje de registro vacio; 'commit' cancelado" + +#: cmd_ws_commit.cc:80 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "revierte archivo(s), directorio(s) o toda el área de trabajo (\".\")" -#: cmd_ws_commit.cc:75 +#: cmd_ws_commit.cc:88 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "" "ud. debe especificar al menos un camino al que ejecutar el 'revert' (quizas " "'.')" -#: cmd_ws_commit.cc:95 +#: cmd_ws_commit.cc:108 #, c-format msgid "no missing files to revert" msgstr "ningún archivo faltante que revertir" -#: cmd_ws_commit.cc:150 +#: cmd_ws_commit.cc:163 #, c-format msgid "reverting %s" msgstr "revirtiendo %s" -#: cmd_ws_commit.cc:154 +#: cmd_ws_commit.cc:167 #, c-format msgid "no file version %s found in database for %s" msgstr "no se encontró ningun archivo versión %s en la base de datos para %s" -#: cmd_ws_commit.cc:167 +#: cmd_ws_commit.cc:180 #, c-format msgid "recreating %s/" msgstr "recreando %s/" -#: cmd_ws_commit.cc:190 +#: cmd_ws_commit.cc:203 msgid "disapprove of a particular revision" msgstr "desaprueba una revisión particular" -#: cmd_ws_commit.cc:206 +#: cmd_ws_commit.cc:219 #, c-format msgid "revision %s has %d changesets, cannot invert" msgstr "revisión %s tiene %d changesets, no puede ser invertida" -#: cmd_ws_commit.cc:210 +#: cmd_ws_commit.cc:223 #, c-format msgid "need --branch argument for disapproval" msgstr "necesita argumento '--branch' para desaprobar" -#: cmd_ws_commit.cc:253 +#: cmd_ws_commit.cc:264 +#, fuzzy +msgid "[DIRECTORY...]" +msgstr "[DIRECTORIO]" + +#: cmd_ws_commit.cc:265 +#, fuzzy +msgid "create one or more directories and add them to the workspace" +msgstr "renombra entradas en el área de trabajo" + +#: cmd_ws_commit.cc:285 +#, fuzzy, c-format +msgid "directory '%s' already exists" +msgstr "directorio '%s' ya existe, no puede ser utilizado para el 'checkout'" + +#: cmd_ws_commit.cc:292 +#, c-format +msgid "ignoring directory '%s' [see .mtn-ignore]" +msgstr "" + +#: cmd_ws_commit.cc:309 msgid "add files to workspace" msgstr "agrega archivos al área de trabajo" -#: cmd_ws_commit.cc:260 +#: cmd_ws_commit.cc:316 #, c-format msgid "cannot set '--unknown' and '--recursive' at the same time" msgstr "no puede especificar '--unknown' y '--recursive' simultaneamente" -#: cmd_ws_commit.cc:262 +#: cmd_ws_commit.cc:318 #, c-format msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" -msgstr "no puede especificar '--unknown' y '--no-respect-ignore' simultaneamente" +msgstr "" +"no puede especificar '--unknown' y '--no-respect-ignore' simultaneamente" -#: cmd_ws_commit.cc:294 +#: cmd_ws_commit.cc:350 msgid "drop files from workspace" msgstr "descarta archivos del área de trabajo" -#: cmd_ws_commit.cc:330 +#: cmd_ws_commit.cc:386 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1465,15 +1515,15 @@ msgstr "" "ORIGEN DESTINO\n" "ORIGEN1 [ORIGEN2 [...]] DIRECTORIO_DESTINO" -#: cmd_ws_commit.cc:332 +#: cmd_ws_commit.cc:388 msgid "rename entries in the workspace" msgstr "renombra entradas en el área de trabajo" -#: cmd_ws_commit.cc:354 +#: cmd_ws_commit.cc:410 msgid "NEW_ROOT PUT_OLD" msgstr "NUEVA_RAIZ COLOCAR_ANTIGUO" -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:411 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1487,31 +1537,31 @@ msgstr "" "directorio raiz se llamará COLOCAR_ANTIGUO.\n" "Es altamente recomendado utilizar '--execute'." -#: cmd_ws_commit.cc:373 +#: cmd_ws_commit.cc:429 msgid "show status of workspace" msgstr "muestra el status del área de trabajo" -#: cmd_ws_commit.cc:402 +#: cmd_ws_commit.cc:458 #, c-format msgid "Current branch: %s" msgstr "Rama actual: %s" -#: cmd_ws_commit.cc:408 +#: cmd_ws_commit.cc:464 #, c-format msgid "Changes against parent %s" msgstr "Cambios con respecto al padre %s" -#: cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:469 #, c-format msgid " no changes" msgstr " sin cambios" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:473 #, c-format msgid " dropped %s" msgstr " descartado %s" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:478 #, c-format msgid "" " renamed %s\n" @@ -1520,21 +1570,21 @@ msgstr "" " renombrado %s\n" " a %s" -#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 +#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487 #, c-format msgid " added %s" msgstr " agregado %s" -#: cmd_ws_commit.cc:435 +#: cmd_ws_commit.cc:491 #, c-format msgid " patched %s" msgstr " parchado %s" -#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105 msgid "[DIRECTORY]" msgstr "[DIRECTORIO]" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:496 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" @@ -1546,47 +1596,47 @@ msgstr "" "De lo contrario, será la cabeza de la rama (explicita o implicita).\n" "Si no se indica un directorio, el nombre de la rama se usará como directorio" -#: cmd_ws_commit.cc:458 +#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1048 #, c-format msgid "use --revision or --branch to specify what to checkout" msgstr "use '--revision' o '--branch' para especificar que chequear" -#: cmd_ws_commit.cc:466 +#: cmd_ws_commit.cc:522 cmd_ws_commit.cc:1054 #, c-format msgid "branch %s has multiple heads:" msgstr "rama %s tiene múltiples cabezas:" -#: cmd_ws_commit.cc:469 +#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057 #, c-format msgid "choose one with '%s checkout -r'" msgstr "elija una con '%s checkout -r'" -#: cmd_ws_commit.cc:470 +#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058 #, c-format msgid "branch %s has multiple heads" msgstr "rama %s tiene múltiples cabezas" -#: cmd_ws_commit.cc:497 +#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041 #, c-format msgid "revision %s is not a member of branch %s" msgstr "revisión %s no es un miembro de la rama %s" -#: cmd_ws_commit.cc:514 +#: cmd_ws_commit.cc:570 #, c-format msgid "you must specify a destination directory" msgstr "ud. debe especificar un directorio destino" -#: cmd_ws_commit.cc:527 +#: cmd_ws_commit.cc:583 #, c-format msgid "checkout directory '%s' already exists" msgstr "directorio '%s' ya existe, no puede ser utilizado para el 'checkout'" -#: cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:617 #, c-format msgid "no file %s found in database for %s" msgstr "no se encontró archivo %s para %s en la base de datos" -#: cmd_ws_commit.cc:579 +#: cmd_ws_commit.cc:635 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1596,45 +1646,45 @@ msgstr "" "get CAMINO [ATRIBUTO]\n" "drop CAMINO [ATRIBUTO]" -#: cmd_ws_commit.cc:580 +#: cmd_ws_commit.cc:636 msgid "set, get or drop file attributes" msgstr "configura, lee o descarta atributos de archivos" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:653 #, c-format msgid "Unknown path '%s'" msgstr "Camino desconocido '%s'" -#: cmd_ws_commit.cc:626 +#: cmd_ws_commit.cc:682 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Camino '%s' no tiene atributo '%s'" -#: cmd_ws_commit.cc:656 +#: cmd_ws_commit.cc:712 #, c-format msgid "No attributes for '%s'" msgstr "No hay atributos para '%s'" -#: cmd_ws_commit.cc:667 +#: cmd_ws_commit.cc:723 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "No hay '%s' en el camino '%s'" -#: cmd_ws_commit.cc:680 +#: cmd_ws_commit.cc:736 msgid "commit workspace to database" msgstr "guarda el área de trabajo en la base de datos" -#: cmd_ws_commit.cc:711 +#: cmd_ws_commit.cc:767 #, c-format msgid "no changes to commit" msgstr "no hay cambios que guardar" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:787 #, c-format msgid "beginning commit on branch '%s'" msgstr "comenzando 'commit' en rama '%s'" -#: cmd_ws_commit.cc:740 +#: cmd_ws_commit.cc:796 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1645,37 +1695,37 @@ msgstr "" "linea de comandos, considere mover o eliminar _MTN/log,\n" "o remueva '--message/--message-file de la linea de comandos?" -#: cmd_ws_commit.cc:755 +#: cmd_ws_commit.cc:811 #, c-format msgid "empty log message; commit canceled" msgstr "mensaje de registro vacio; 'commit' cancelado" -#: cmd_ws_commit.cc:777 +#: cmd_ws_commit.cc:833 #, c-format msgid "log message rejected by hook: %s" msgstr "mensaje de registro cancelado por el hook: %s" -#: cmd_ws_commit.cc:785 +#: cmd_ws_commit.cc:841 #, c-format msgid "revision %s already in database" msgstr "revisión %s ya está en la base de datos" -#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 +#: cmd_ws_commit.cc:880 cmd_ws_commit.cc:910 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "archivo '%s' modificado durante el 'commit', abortando" -#: cmd_ws_commit.cc:836 +#: cmd_ws_commit.cc:892 #, c-format msgid "Your database is missing version %s of file '%s'" msgstr "A su base de datos le falta la versión %s del archivo '%s'" -#: cmd_ws_commit.cc:886 +#: cmd_ws_commit.cc:942 #, c-format msgid "committed revision %s" msgstr "guardada revisión %s" -#: cmd_ws_commit.cc:892 +#: cmd_ws_commit.cc:948 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1684,16 +1734,42 @@ msgstr "" "nota: esta revisión crea divergencia\n" "nota: quizas (o quizas no) quiera ejecutar '%s merge'" -#: cmd_ws_commit.cc:926 +#: cmd_ws_commit.cc:982 msgid "setup a new workspace directory, default to current" msgstr "configura una nueva área de trabajo, por omisión el directorio actual" -#: cmd_ws_commit.cc:932 +#: cmd_ws_commit.cc:988 #, c-format msgid "need --branch argument for setup" msgstr "necesita el argumento '--branch' para 'setup'" -#: cmd_ws_commit.cc:949 +#: cmd_ws_commit.cc:1004 +#, fuzzy +msgid "DIRECTORY" +msgstr "[DIRECTORIO]" + +#: cmd_ws_commit.cc:1005 +msgid "import the contents of the given directory tree into a given branch" +msgstr "" + +#: cmd_ws_commit.cc:1016 +#, fuzzy, c-format +msgid "you must specify a directory to import" +msgstr "ud. debe especificar un directorio destino" + +#: cmd_ws_commit.cc:1067 +#, fuzzy, c-format +msgid "import directory '%s' doesn't exists" +msgstr "Directorio '%s' no existe" + +#: cmd_ws_commit.cc:1068 +#, fuzzy, c-format +msgid "import directory '%s' is a file" +msgstr "" +"no se pudo crear directorio '%s'\n" +"es un archivo" + +#: cmd_ws_commit.cc:1106 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -1701,7 +1777,7 @@ msgstr "" "migra la metadata del directorio área de trabajo al formato más reciente; " "por omisión el área de trabajo actual" -#: cmd_ws_commit.cc:962 +#: cmd_ws_commit.cc:1119 msgid "refresh the inodeprint cache" msgstr "refresca el cache inodeprint" @@ -1782,7 +1858,7 @@ msgstr "marcas" msgid "markings" msgstr "marcas" -#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244 msgid "revisions" msgstr "revisiones" @@ -1790,7 +1866,7 @@ msgstr "ascendencia" msgid "ancestry" msgstr "ascendencia" -#: database_check.cc:434 netsync.cc:2973 +#: database_check.cc:434 netsync.cc:3067 msgid "keys" msgstr "llaves" @@ -2255,27 +2331,27 @@ msgstr "queria %d filas y obtuvo %d en e msgid "wanted %d rows got %d in query: %s" msgstr "queria %d filas y obtuvo %d en el query: %s" -#: database.cc:2040 +#: database.cc:2043 #, c-format msgid "another key with name '%s' already exists" msgstr "ya existe otra llave con nombre '%s'" -#: database.cc:3037 +#: database.cc:3041 #, c-format msgid "no database specified" msgstr "no se especificó base de datos" -#: database.cc:3045 +#: database.cc:3049 #, c-format msgid "database %s does not exist" msgstr "base de datos %s inexistente" -#: database.cc:3046 +#: database.cc:3050 #, c-format msgid "%s is a directory, not a database" msgstr "%s es un directorio, no una base de datos" -#: database.cc:3071 +#: database.cc:3075 #, c-format msgid "could not open database '%s': %s" msgstr "no puede abrir base de datos '%s': %s" @@ -2310,7 +2386,7 @@ msgstr "" "[ derecha] %s\n" "[ merged] %s" -#: file_io.cc:176 file_io.cc:183 +#: file_io.cc:194 file_io.cc:201 #, c-format msgid "" "could not create directory '%s'\n" @@ -2319,7 +2395,7 @@ msgstr "" "no se pudo crear directorio '%s'\n" "es un archivo" -#: file_io.cc:178 +#: file_io.cc:196 #, c-format msgid "" "could not create directory '%s'\n" @@ -2328,17 +2404,17 @@ msgstr "" "no se pudo crear directorio '%s'\n" "%s" -#: file_io.cc:182 +#: file_io.cc:200 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear directorio '%s'" -#: file_io.cc:195 +#: file_io.cc:213 #, c-format msgid "failed to create directory '%s' for '%s'" msgstr "creación de directorio '%s' para '%s' falló" -#: file_io.cc:209 +#: file_io.cc:227 #, c-format msgid "" "could not remove '%s'\n" @@ -2347,109 +2423,109 @@ msgstr "" "no se pudo remover '%s'\n" "%s" -#: file_io.cc:219 +#: file_io.cc:237 #, c-format msgid "file to delete '%s' does not exist" msgstr "archivo a borrar '%s' no existe" -#: file_io.cc:220 +#: file_io.cc:238 #, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "archivo a borrar, '%s', no es un archivo sinó un directorio" -#: file_io.cc:228 +#: file_io.cc:246 #, c-format msgid "directory to delete '%s' does not exist" msgstr "directorio a borrar '%s' no existe" -#: file_io.cc:229 +#: file_io.cc:247 #, c-format msgid "directory to delete, '%s', is not a directory but a file" msgstr "directorio a borrar, '%s', no es un directorio sinó un archivo" -#: file_io.cc:236 +#: file_io.cc:254 #, c-format msgid "object to delete, '%s', does not exist" msgstr "objeto a borrar, '%s', no existe" -#: file_io.cc:244 +#: file_io.cc:262 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "directorio a borrar, '%s', no existe" -#: file_io.cc:245 +#: file_io.cc:263 #, c-format msgid "directory to delete, '%s', is a file" msgstr "directorio a borrar, '%s', es un archivo" -#: file_io.cc:254 +#: file_io.cc:272 #, c-format msgid "rename source file '%s' does not exist" msgstr "archivo fuente a renombrar '%s' no existe" -#: file_io.cc:255 +#: file_io.cc:273 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" msgstr "archivo fuente a renombrar '%s' es un directorio -- bug en monotone?" -#: file_io.cc:258 file_io.cc:271 +#: file_io.cc:276 file_io.cc:289 #, c-format msgid "rename target '%s' already exists" msgstr "destino al renombrar '%s' ya existe" -#: file_io.cc:267 +#: file_io.cc:285 #, c-format msgid "rename source dir '%s' does not exist" msgstr "directorio fuente a renombrar '%s' no existe" -#: file_io.cc:268 +#: file_io.cc:286 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" msgstr "directorio fuente a renombrar '%s' es un archivo -- bug en monotone?" -#: file_io.cc:282 +#: file_io.cc:300 #, c-format msgid "rename source path '%s' does not exist" msgstr "camino de la fuente a renombrar '%s' no existe" -#: file_io.cc:297 +#: file_io.cc:315 #, c-format msgid "file %s does not exist" msgstr "archivo %s no existe" -#: file_io.cc:298 +#: file_io.cc:316 #, c-format msgid "file %s cannot be read as data; it is a directory" msgstr "archivo %s no puede ser leido como data; es un directorio" -#: file_io.cc:302 +#: file_io.cc:320 #, c-format msgid "cannot open file %s for reading" msgstr "no se pudo abrir archivo %s para lectura" -#: file_io.cc:341 +#: file_io.cc:359 #, c-format msgid "Cannot read standard input multiple times" msgstr "no se pudo leer 'standard input' múltiples veces" -#: file_io.cc:372 +#: file_io.cc:390 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "archivo '%s' no puede ser reescrito como data; es un directorio" -#: file_io.cc:380 +#: file_io.cc:398 #, c-format msgid "cannot open file %s for writing" msgstr "no se puede abrir archivo %s para escritura" -#: file_io.cc:437 +#: file_io.cc:455 #, c-format msgid "caught runtime error %s constructing file path for %s" msgstr "" "se recibió un error en tiempo de ejecución %s construyendo el camino del " "archivo para %s" -#: file_io.cc:530 work.cc:1079 +#: file_io.cc:548 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "no existe el archivo o directorio: '%s'" @@ -2494,22 +2570,22 @@ msgstr "frase clave para '%s' es incorre msgid "passphrase for '%s' is incorrect" msgstr "frase clave para '%s' es incorrecta" -#: lua.cc:462 lua.cc:476 +#: lua.cc:463 lua.cc:477 lua.cc:512 #, c-format msgid "%s called with an invalid parameter" msgstr "%s invocado con un parámetro inválido" -#: lua.cc:479 +#: lua.cc:480 lua.cc:515 #, c-format msgid "Directory '%s' does not exist" msgstr "Directorio '%s' no existe" -#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 +#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "'%s' no es un directorio" -#: lua.cc:499 +#: lua.cc:500 lua.cc:538 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "error de lua al cargar archivo rc '%s'" @@ -2649,41 +2725,41 @@ msgstr "chequeo de '%s' falló" msgstr "chequeo de '%s' falló" # TODO: traducir o nó? -#: netsync.cc:724 +#: netsync.cc:760 msgid "bytes in" msgstr "bytes in" -#: netsync.cc:726 +#: netsync.cc:762 msgid "bytes out" msgstr "bytes out" -#: netsync.cc:730 +#: netsync.cc:766 msgid "certs in" msgstr "certs in" -#: netsync.cc:732 netsync.cc:745 +#: netsync.cc:768 netsync.cc:781 msgid "revs in" msgstr "revs in" -#: netsync.cc:737 +#: netsync.cc:773 msgid "certs out" msgstr "certs out" -#: netsync.cc:739 netsync.cc:747 +#: netsync.cc:775 netsync.cc:783 msgid "revs out" msgstr "revs out" -#: netsync.cc:853 +#: netsync.cc:889 #, c-format msgid "underflow on count of %s items to receive" msgstr "conteo insuficiente de %s items a recibir" -#: netsync.cc:1201 +#: netsync.cc:1261 netsync.cc:1269 #, c-format msgid "received network error: %s" msgstr "error de red recibido: %s" -#: netsync.cc:1236 +#: netsync.cc:1304 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2704,12 +2780,12 @@ msgstr "" "Yo esperaba %s\n" "'%s unset %s %s' para forzar este chequeo" -#: netsync.cc:1246 +#: netsync.cc:1314 #, c-format msgid "server key changed" msgstr "cambió la llave del servidor" -#: netsync.cc:1251 +#: netsync.cc:1319 #, c-format msgid "" "first time connecting to server %s\n" @@ -2720,55 +2796,50 @@ msgstr "" "Asumiré que es realmente el, pero ud. debe verificar\n" "La impresión digital de la llave: %s" -#: netsync.cc:1258 +#: netsync.cc:1326 #, c-format msgid "saving public key for %s to database" msgstr "guardando la llave pública de %s en la base de datos" -#: netsync.cc:1352 +#: netsync.cc:1429 #, c-format msgid "rejected attempt at anonymous connection for write" msgstr "rechazado intento de conexión anónima para escritura" # TODO: Que carajo es "running as sink"? -#: netsync.cc:1358 +#: netsync.cc:1436 #, c-format msgid "rejected attempt at anonymous connection while running as sink" msgstr "rechazado intento de conexión anónima operando como servidor" -#: netsync.cc:1372 netsync.cc:1496 +#: netsync.cc:1452 #, c-format -msgid "not serving branch '%s'" -msgstr "la rama '%s' no está siendo servida" - -#: netsync.cc:1377 -#, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "acceso anónimo a la rama '%s' rechazado por el servidor" -#: netsync.cc:1385 +#: netsync.cc:1460 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'" msgstr "permiso de lectura anónima autorizada para '%s' excluyendo '%s'" -#: netsync.cc:1391 +#: netsync.cc:1466 #, c-format msgid "allowed anonymous read/write permission for '%s' excluding '%s'" msgstr "" "permiso de lectura/escritura anónima autorizada para '%s' excluyendo '%s'" -#: netsync.cc:1447 +#: netsync.cc:1531 #, c-format +msgid "remote public key hash '%s' is unknown" +msgstr "hash de la llave pública remota '%s' es desconocido" + +#: netsync.cc:1549 +#, c-format msgid "detected replay attack in auth netcmd" msgstr "detectado un ataque 'replay' en el netcmd de autenticación" -#: netsync.cc:1468 +#: netsync.cc:1571 #, c-format -msgid "remote public key hash '%s' is unknown" -msgstr "hash de la llave pública remota '%s' es desconocido" - -#: netsync.cc:1484 -#, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " "sink" @@ -2776,7 +2847,7 @@ msgstr "" "denegado a '%s' el permiso de lectura para '%s' excluyendo a '%s' mientras " "ejecuta como pura lectura" -#: netsync.cc:1501 +#: netsync.cc:1584 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" @@ -2784,12 +2855,12 @@ msgstr "" "denegado a '%s' permiso de lectura para '%s' excluyendo '%s' a causa de la " "rama '%s'" -#: netsync.cc:1511 +#: netsync.cc:1594 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'" msgstr "aprobado a '%s' el permiso de lectura para '%s' excluyendo '%s'" -#: netsync.cc:1521 +#: netsync.cc:1605 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -2798,146 +2869,146 @@ msgstr "" "denegado a '%s' el permiso de escritura para '%s' excluyendo '%s' al " "ejecutar como fuente pura" -#: netsync.cc:1528 +#: netsync.cc:1613 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'" msgstr "denegado a '%s' permiso de escritura para '%s' excluyendo '%s'" -#: netsync.cc:1532 +#: netsync.cc:1617 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'" msgstr "aprobado a '%s' permiso de escritura para '%s' excluyendo '%s'" -#: netsync.cc:1556 +#: netsync.cc:1641 #, c-format msgid "bad client signature" msgstr "firma del cliente incorrecta" -#: netsync.cc:1572 +#: netsync.cc:1657 #, c-format msgid "Unexpected 'refine' command on non-refined item type" msgstr "comando 'refine' inesperado en un item de tipo no refinado" -#: netsync.cc:1669 +#: netsync.cc:1754 #, c-format msgid "unknown bye phase %d received" msgstr "recibida fase de despedida %d desconocida" -#: netsync.cc:1684 +#: netsync.cc:1769 #, c-format msgid "Unexpected 'done' command on non-refined item type" msgstr "Comando 'done' inesperado en item de tipo no refinado" -#: netsync.cc:1756 +#: netsync.cc:1841 #, c-format msgid "%s with hash '%s' does not exist in our database" msgstr "%s con hash '%s' no existe en nuestra base de datos" -#: netsync.cc:1859 +#: netsync.cc:1945 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" "Epoca no concordante en rama %s. Servidor tiene '%s', cliente tiene '%s'." -#: netsync.cc:1877 +#: netsync.cc:1963 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "" "chequeo del hash falló para la llave pública '%s' (%s); esperaba '%s' obtuvo " "'%s'" -#: netsync.cc:1891 +#: netsync.cc:1977 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "chequeo del hash falló para el certificado de revisión '%s'" -#: netsync.cc:1953 +#: netsync.cc:2039 #, c-format msgid "Received warning from usher: %s" msgstr "Recibió advertencia de 'usher': %s" # TODO: que tal "productor y consumidor" -#: netsync.cc:2040 netsync.cc:2071 +#: netsync.cc:2126 netsync.cc:2157 msgid "source and sink" msgstr "fuente y destino" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "source" msgstr "fuente" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "sink" msgstr "destino" -#: netsync.cc:2228 +#: netsync.cc:2314 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "" "bufer de entrada para el peer %s está rebasado despues del netcmd 'dispatch'" -#: netsync.cc:2240 netsync.cc:2339 +#: netsync.cc:2326 netsync.cc:2425 #, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "error de protocolo procesando el peer %s: '%s'" -#: netsync.cc:2246 +#: netsync.cc:2332 #, c-format msgid "error: %s" msgstr "error: %s" -#: netsync.cc:2310 +#: netsync.cc:2396 #, c-format msgid "connecting to %s" msgstr "conectandose a %s" -#: netsync.cc:2354 +#: netsync.cc:2440 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting" msgstr "tiempo expiró esperando or E/S con el peer %s, desconectando" -#: netsync.cc:2377 +#: netsync.cc:2463 #, c-format msgid "processing failure while talking to peer %s, disconnecting" msgstr "falla de procesamiento hablando con peer %s, desconectando" -#: netsync.cc:2394 +#: netsync.cc:2480 #, c-format msgid "successful exchange with %s" msgstr "intercambio exitoso con %s" -#: netsync.cc:2400 +#: netsync.cc:2486 #, c-format msgid "peer %s disconnected after we informed them of error" msgstr "peer %s desconectado despues de ser informado de error" -#: netsync.cc:2405 +#: netsync.cc:2491 #, c-format msgid "I/O failure while talking to peer %s, disconnecting" msgstr "falla de E/S hablando con el peer %s, desconectando" -#: netsync.cc:2471 +#: netsync.cc:2557 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" msgstr "" "error de protocolo mientras se procesaba peer %s: '%s', marcado como " "incorrecto" -#: netsync.cc:2503 +#: netsync.cc:2589 #, c-format msgid "accepted new client connection from %s : %s" msgstr "nueva conexión de cliente aceptada desde %s : %s" -#: netsync.cc:2540 +#: netsync.cc:2626 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" msgstr "error de protocolo mientras se procesaba peer %s: '%s', desconectando" -#: netsync.cc:2551 +#: netsync.cc:2637 #, c-format msgid "peer %s read failed in working state (error)" msgstr "lectura del peer %s falló en estado 'working' (error)" -#: netsync.cc:2556 +#: netsync.cc:2642 #, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)" @@ -2945,17 +3016,17 @@ msgstr "" "lectura del peer %s falló en estado 'shutdown' (posiblemente el cliente " "reportó incorrectamente un error)" -#: netsync.cc:2562 +#: netsync.cc:2648 #, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "lectura del peer %s falló en estado 'confirmed' (éxito)" -#: netsync.cc:2583 +#: netsync.cc:2669 #, c-format msgid "peer %s write failed in working state (error)" msgstr "escritura del peer '%s' falló en estado 'working' (error)" -#: netsync.cc:2588 +#: netsync.cc:2674 #, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)" @@ -2963,65 +3034,70 @@ msgstr "" "escritura del peer %s falló en estado 'shutdown' (posiblemente el cliente " "reportó incorrectamente el error)" -#: netsync.cc:2594 +#: netsync.cc:2680 #, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "escritura del peer %s falló en estado 'confirmed' (éxito)" -#: netsync.cc:2621 +#: netsync.cc:2707 #, c-format msgid "peer %s processing finished, disconnecting" msgstr "procesado del peer %s concluido, desconectando" -#: netsync.cc:2643 +#: netsync.cc:2729 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting" msgstr "fd %d (peer %s) inactivo por demasiado tiempo, desconectando" -#: netsync.cc:2711 +#: netsync.cc:2797 #, c-format msgid "beginning service on %s : %s" msgstr "comenzando servicio en %s : %s" -#: netsync.cc:2712 +#: netsync.cc:2798 msgid "" msgstr "" -#: netsync.cc:2726 +#: netsync.cc:2812 #, c-format msgid "session limit %d reached, some connections will be refused" msgstr "limite de sesiones %d alcanzado, algunas conexiones serán rechazadas" -#: netsync.cc:2791 +#: netsync.cc:2879 +#, fuzzy, c-format +msgid "Network error on peer %s, disconnecting" +msgstr "OOB recibido del peer %s, desconectando" + +#: netsync.cc:2885 #, c-format msgid "got OOB from peer %s, disconnecting" msgstr "OOB recibido del peer %s, desconectando" -#: netsync.cc:2851 +#: netsync.cc:2945 #, c-format msgid "beginning service on %s" msgstr "comenzando servicio en %s" -#: netsync.cc:2914 +#: netsync.cc:3008 #, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting" msgstr "data OOB recibida via el fd %d (peer %s), desconectando" -#: netsync.cc:2963 +#: netsync.cc:3057 #, c-format msgid "finding items to synchronize:" msgstr "buscando items que sincronizar:" -#: netsync.cc:2971 +#: netsync.cc:3065 msgid "certificates" msgstr "certificados" -#: netsync.cc:3084 +#: netsync.cc:3178 #, c-format msgid "Cannot find key '%s'" msgstr "No puedo encontrar llave '%s'" -#: netsync.cc:3124 +#: netsync.cc:3218 #, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -3030,7 +3106,7 @@ msgstr "" "patrón de inclusión de rama contiene comillas:\n" "%s" -#: netsync.cc:3130 +#: netsync.cc:3224 #, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -3039,7 +3115,7 @@ msgstr "" "patrón de exclusión de rama contiene comillas:\n" "%s" -#: netsync.cc:3165 netsync.cc:3169 +#: netsync.cc:3259 netsync.cc:3263 #, c-format msgid "network error: %s" msgstr "error de red: %s" @@ -3052,7 +3128,7 @@ msgstr "tamaño de bloque en bytes para msgid "block size in bytes for \"automate stdio\" output" msgstr "tamaño de bloque en bytes para salida de \"automate stdio\"" -#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#: options_list.hh:32 options_list.hh:317 options_list.hh:360 #, c-format msgid "cannot be zero or negative" msgstr "no puede cero o negativo" @@ -3135,142 +3211,150 @@ msgstr "" "al generar los rosters, descarta entradas de atributos con la llave dada" #: options_list.hh:228 +msgid "don't perform the operation, just show what would have happened" +msgstr "" + +#: options_list.hh:236 msgid "file to dump debugging log to, on failure" msgstr "archivo en el que vaciar el log de debug, en caso de falla" -#: options_list.hh:237 +#: options_list.hh:245 msgid "leave out anything described by its argument" msgstr "no incluir nada descrito por este argumento" -#: options_list.hh:245 +#: options_list.hh:253 msgid "perform the associated file operation" msgstr "ejecuta la operación de archivo asociada" -#: options_list.hh:253 +#: options_list.hh:261 msgid "print detailed version number, then exit" msgstr "imprime el número versión detallado, y termina" -#: options_list.hh:260 +#: options_list.hh:268 msgid "display help message" msgstr "muestra mensaje de ayuda" -#: options_list.hh:269 +#: options_list.hh:277 msgid "include anything described by its argument" msgstr "incluye tod lo descrito por este argumento" -#: options_list.hh:277 +#: options_list.hh:285 msgid "set key for signatures" msgstr "configura la clave a usar para las firmas" -#: options_list.hh:285 +#: options_list.hh:293 msgid "set location of key store" msgstr "configura la ubicación del llavero" -#: options_list.hh:294 +#: options_list.hh:302 msgid "push the specified key even if it hasn't signed anything" msgstr "envia la llave especificada incluso si no ha firmado nada" -#: options_list.hh:304 +#: options_list.hh:312 msgid "limit log output to the last number of entries" msgstr "limita la salida dd registro al último número de entradas" -#: options_list.hh:313 +#: options_list.hh:321 msgid "file to write the log to" msgstr "archivo al que escribir el registro" # TODO: "'changelog' del 'commit'". Mejor 'commit' suicidio.... pero que usar? -#: options_list.hh:324 +#: options_list.hh:332 msgid "set commit changelog message" msgstr "configura el mensaje de 'changelog' del 'commit'" -#: options_list.hh:331 +#: options_list.hh:339 msgid "set filename containing commit changelog message" msgstr "" "configura el archivo que contiene el mensaje de 'changelog' del 'commit'" -#: options_list.hh:339 +#: options_list.hh:347 msgid "perform the operations for files missing from workspace" msgstr "realiza las operaciones para archivos faltantes en el área de trabajo" -#: options_list.hh:347 +#: options_list.hh:355 msgid "limit log output to the next number of entries" msgstr "limita la salida de registro al siguiente número de entradas" -#: options_list.hh:357 +#: options_list.hh:365 msgid "exclude files when printing logs" msgstr "excluye archivos al imprimir los registros" -#: options_list.hh:365 +#: options_list.hh:373 msgid "do not ignore any files" msgstr "no ignorar ningún archivo" -#: options_list.hh:373 +#: options_list.hh:381 msgid "exclude merges when printing logs" msgstr "excluir 'merges' al imprimir los registros" -#: options_list.hh:381 +#: options_list.hh:389 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" msgstr "no cargar los archivos lua ~/.monotone/monotonerc o _MTN/monotonerc" -#: options_list.hh:389 +#: options_list.hh:397 msgid "do not load standard lua hooks" msgstr "no cargar los hooks lua standard" -#: options_list.hh:397 +#: options_list.hh:405 msgid "record process id of server" msgstr "registrar el identificador de proceso del servidor" -#: options_list.hh:405 +#: options_list.hh:413 msgid "suppress verbose, informational and progress messages" msgstr "suprime mensajes adicionales, informacionales y de progreso" -#: options_list.hh:415 +#: options_list.hh:423 msgid "load extra rc file" msgstr "cargar archivo rc extra" -#: options_list.hh:423 +#: options_list.hh:431 msgid "suppress warning, verbose, informational and progress messages" msgstr "" "suprime mensajes adicionales, de advertencia, informacionales y de progreso" -#: options_list.hh:433 +#: options_list.hh:441 msgid "also operate on the contents of any listed directories" msgstr "tambien operar en los contenidos de cualquier directorio listado" -#: options_list.hh:442 +#: options_list.hh:450 msgid "select revision id for operation" msgstr "selecciona el identificador de revisión para operación" -#: options_list.hh:450 +#: options_list.hh:458 msgid "limit search for workspace to specified root" msgstr "limita la busqueda de área de trabajo a la raiz especificada" -#: options_list.hh:458 +#: options_list.hh:466 msgid "use the current arguments as the future default" msgstr "utiliza los argumentos actuales por omisión en el futuro" -#: options_list.hh:466 +#: options_list.hh:474 msgid "set ticker style (count|dot|none)" msgstr "selecciona el estilo del contador (count|dot|none)" -#: options_list.hh:477 +#: options_list.hh:485 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "argumento debe ser 'none', 'dot' o 'count'" -#: options_list.hh:482 +#: options_list.hh:489 +msgid "revision(s) to stop logging at" +msgstr "" + +#: options_list.hh:497 msgid "perform the operations for unknown files from workspace" msgstr "realiza las operaciones para archivos desconocidos del área de trabajo" -#: options_list.hh:490 +#: options_list.hh:506 msgid "verbose completion output" msgstr "salida de completación detallada" -#: options_list.hh:498 +#: options_list.hh:514 msgid "print version number, then exit" msgstr "imprime el número de versión, luego termina" -#: options_list.hh:506 +#: options_list.hh:522 msgid "insert command line arguments taken from the given file" msgstr "" "inserta los argumentos a la linea de comandos tomados del archivo " @@ -3389,6 +3473,28 @@ msgstr "etiquetas" msgid "tags" msgstr "etiquetas" +#: restrictions.cc:60 restrictions.cc:77 +#, c-format +msgid "conflicting include/exclude on path '%s'" +msgstr "" + +#: restrictions.cc:103 restrictions.cc:141 +#, c-format +msgid "restriction includes unknown path '%s'" +msgstr "" + +#: restrictions.cc:114 restrictions.cc:155 +#, c-format +msgid "restriction excludes unknown path '%s'" +msgstr "" + +#: restrictions.cc:118 restrictions.cc:159 +#, fuzzy, c-format +msgid "%d unknown path" +msgid_plural "%d unknown paths" +msgstr[0] "Camino desconocido '%s'" +msgstr[1] "Camino desconocido '%s'" + #: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" @@ -4006,3 +4112,14 @@ msgstr "esta área de trabajo está en e 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 "read from client failed with error code: %d" +#~ msgstr "lectura del cliente falló con código de error: %d" + +#~ msgid "no hostname given" +#~ msgstr "no se ha especificado nombre de host" + +#~ msgid "PATTERN ..." +#~ msgstr "PATRÓN ..." + +#~ msgid "not serving branch '%s'" +#~ msgstr "la rama '%s' no está siendo servida" ============================================================ --- po/fr.po c7f466da52c97eee89a2c0fc1f187ebdd63fbb42 +++ po/fr.po 7837e341823decadddae131fd0fbfaa920cc428e @@ -243,7 +243,7 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.28\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-14 23:43+0100\n" +"POT-Creation-Date: 2006-12-15 00:27+0100\n" "PO-Revision-Date: 2006-09-22 23:40+0200\n" "Last-Translator: Benoît Dejean \n" "Language-Team: Benoît Dejean \n" @@ -281,13 +281,23 @@ msgstr "[BRANCHE]" msgid "[BRANCH]" msgstr "[BRANCHE]" -#: automate.cc:88 automate.cc:135 automate.cc:1206 +#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218 +#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529 +#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098 +#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297 +#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559 +#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656 +#, c-format +msgid "wrong argument count" +msgstr "" + +#: automate.cc:88 automate.cc:135 automate.cc:1183 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "RÉV1 [RÉV2 [RÉV3 [...]]]" #: 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 +#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454 +#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "Aucune révision « %s »" @@ -309,96 +319,99 @@ msgstr "NOUVELLE_RÉV [ANCIENNE_RÉV1 [A msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "NOUVELLE_RÉV [ANCIENNE_RÉV1 [ANCIENNE_RÉV2 [...]]]" -#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 +#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942 +#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332 +#: cmd_list.cc:564 +#, c-format +msgid "no arguments needed" +msgstr "" + +#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699 msgid "REV" msgstr "RÉV" -#: automate.cc:524 +#: automate.cc:526 msgid "SELECTOR" msgstr "SÉLECTEUR" -#: automate.cc:893 automate.cc:1023 +#: automate.cc:895 automate.cc:1025 msgid "[REVID]" msgstr "[ID_RÉV]" -#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 -#: automate.cc:1593 +#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566 +#: automate.cc:1571 #, c-format msgid "no revision %s found in database" msgstr "la révision « %s » n'existe pas dans la base de données" -#: automate.cc:1066 automate.cc:1145 -msgid "FILEID" -msgstr "ID_FICHIER" - -#: 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" - -#: automate.cc:1092 automate.cc:1118 cmd_merging.cc:845 +#: automate.cc:1069 automate.cc:1095 cmd_merging.cc:845 msgid "REVID" msgstr "ID_RÉVISION" -#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163 #: 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 +#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535 +#: cmd_ws_commit.cc:1023 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "aucune révision « %s »" -#: automate.cc:1156 +#: automate.cc:1122 cmd_files.cc:250 +msgid "FILEID" +msgstr "ID_FICHIER" + +#: automate.cc:1133 #, c-format msgid "no such file '%s'" msgstr "aucun fichier « %s »" -#: automate.cc:1172 +#: automate.cc:1149 msgid "OLD_FILE NEW_FILE" msgstr "ANCIEN_FICHIER NOUVEL_FICHIER" -#: automate.cc:1317 +#: automate.cc:1294 msgid "[BRANCH_PATTERN]" msgstr "[MOTIF_DE_BRANCHE]" -#: automate.cc:1413 +#: automate.cc:1391 msgid "KEYID PASSPHRASE" msgstr "ID_CLEF PHRASE_DE_PASSE" -#: automate.cc:1431 cmd_key_cert.cc:42 +#: automate.cc:1409 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "la clef « %s » existe déjà" -#: automate.cc:1434 cmd_key_cert.cc:45 +#: automate.cc:1412 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "génération de la paire de clef « %s »" -#: automate.cc:1436 cmd_key_cert.cc:47 +#: automate.cc:1414 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "enregistrement de la paire de clefs « %s » dans %s/" -#: automate.cc:1472 +#: automate.cc:1450 msgid "OPTION" msgstr "OPTION" -#: automate.cc:1495 +#: automate.cc:1473 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "« %s » n'est pas une option reconnue pour l'espace de travail" -#: automate.cc:1518 +#: automate.cc:1496 msgid "REV FILE" msgstr "RÉV FICHIER" -#: automate.cc:1535 automate.cc:1599 +#: automate.cc:1513 automate.cc:1577 #, c-format msgid "file %s is unknown for revision %s" msgstr "le fichier « %s » est inconnu pour la révision %s" -#: automate.cc:1578 +#: automate.cc:1556 msgid "REV1 FILE REV2" msgstr "RÉV1 FICHIER RÉV2" @@ -484,27 +497,36 @@ msgstr "" "multiples certifs de branche trouvés pour la révision %s, veuillez donne le " "nom d'une branche" -#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 -#: cmd_automate.cc:340 -#, c-format -msgid "Bad input to automate stdio" +#: cmd_automate.cc:150 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected ':' after string size" 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: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:169 +#: cmd_automate.cc:197 #, fuzzy, c-format -msgid "Bad input to automate stdio (unexpected EOF)" +msgid "Bad input to automate stdio: unknown start token '%c'" msgstr "mauvaise donnée en entrée à parse_basic_io" -#: cmd_automate.cc:365 +#: cmd_automate.cc:219 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected '%c' token" +msgstr "mauvaise donnée en entrée à parse_basic_io" + +#: cmd_automate.cc:344 +#, fuzzy, c-format +msgid "Bad input to automate stdio: command name is missing" +msgstr "mauvaise donnée en entrée à parse_basic_io" + +#: cmd_automate.cc:373 msgid "automation" msgstr "automatisation" -#: cmd_automate.cc:366 +#: cmd_automate.cc:374 msgid "automation interface" msgstr "interface d'automatisation" @@ -589,7 +611,7 @@ msgstr "aucune variable nommée %s dans msgstr "aucune variable nommée %s dans le domaine %s" #: 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 +#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429 #: commands.cc:275 msgid "informative" msgstr "information" @@ -612,8 +634,8 @@ msgstr "" 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 +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 +#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735 msgid "[PATH]..." msgstr "[CHEMIN]..." @@ -662,7 +684,7 @@ 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:616 +#: cmd_diff_log.cc:617 #, c-format msgid "only one of --last/--next allowed" msgstr "seul un de --last et --next est permis" @@ -754,19 +776,24 @@ msgstr "calculer l'identité du CHEMIN o 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:185 +#, c-format +msgid "no file version %s found in database" +msgstr "aucune version du fichier « %s » trouvé dans la base de données" + +#: cmd_files.cc:210 cmd_files.cc:214 +#, c-format +msgid "no file '%s' found in revision '%s'" +msgstr "aucun fichier « %s » dans la révision « %s »" + +#: cmd_files.cc:221 cmd_files.cc:273 msgid "FILENAME" msgstr "FICHIER" -#: cmd_files.cc:183 +#: cmd_files.cc:222 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 -#, c-format -msgid "no file '%s' found in revision '%s'" -msgstr "aucun fichier « %s » dans la révision « %s »" - #: cmd.hh:89 #, c-format msgid "non-hex digits in id" @@ -891,7 +918,7 @@ msgstr "NON-fiable" msgstr "NON-fiable" #: 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 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202 msgid "review" msgstr "examination" @@ -911,7 +938,7 @@ msgstr "note le résultat d'un test sur 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:223 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202 msgid "REVISION" msgstr "RÉVISION" @@ -942,7 +969,7 @@ msgstr "commentaire vide" msgid "empty comment" msgstr "commentaire vide" -#: cmd_list.cc:64 cmd_list.cc:676 +#: cmd_list.cc:64 cmd_list.cc:677 #, c-format msgid "no public key '%s' found in database" msgstr "aucune clef publique « %s » dans la base de données" @@ -1029,9 +1056,10 @@ 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: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 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349 +#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635 +#: cmd_ws_commit.cc:735 msgid "workspace" msgstr "espace de travail" @@ -1150,8 +1178,8 @@ msgstr "[fusionné] %s" msgstr "[fusionné] %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:439 cmd_ws_commit.cc:925 -#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 +#: cmd_merging.cc:821 cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 +#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119 msgid "tree" msgstr "arborescence" @@ -1165,7 +1193,7 @@ msgstr "veuillez préciser une branche a 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:463 +#: cmd_ws_commit.cc:519 #, c-format msgid "branch '%s' is empty" msgstr "la branche « %s » est vide" @@ -1388,91 +1416,83 @@ msgstr "décharge la list associée avec 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:43 +#: cmd_netsync.cc:33 #, c-format msgid "setting default server to %s" msgstr "paramétrage de l'adresse par défaut du serveur à %s" -#: cmd_netsync.cc:49 +#: cmd_netsync.cc:40 #, c-format -msgid "no hostname given" -msgstr "aucun nom d'hôte fourni" - -#: 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:79 cmd_netsync.cc:101 +#: cmd_netsync.cc:72 #, c-format msgid "no branch pattern given" msgstr "aucun motif de branche fourni" -#: cmd_netsync.cc:88 +#: cmd_netsync.cc:80 #, 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:95 +#: cmd_netsync.cc:86 #, 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:103 +#: cmd_netsync.cc:93 #, 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:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184 msgid "network" msgstr "réseau" -#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESSE[:PORT] [MOTIF]]" -#: cmd_netsync.cc:120 +#: cmd_netsync.cc:110 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:133 +#: cmd_netsync.cc:124 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:141 +#: cmd_netsync.cc:132 #, 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:148 +#: cmd_netsync.cc:139 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "" "synchronise les branches correspondant au MOTIF au serveur netsync à ADRESSE" -#: cmd_netsync.cc:167 +#: cmd_netsync.cc:160 #, c-format msgid "pid file '%s' already exists" msgstr "le fichier pid « %s » existe déjà" -#: cmd_netsync.cc:169 +#: cmd_netsync.cc:162 #, c-format msgid "failed to create pid file '%s'" msgstr "impossible de créer le fichier pid « %s »" -#: cmd_netsync.cc:191 -msgid "PATTERN ..." -msgstr "CHEMIN ..." - -#: cmd_netsync.cc:192 -msgid "serve the branches specified by PATTERNs to connecting clients" +#: cmd_netsync.cc:185 +#, fuzzy +msgid "serve the database to connecting clients" msgstr "" "servir les branches spécifiées par les MOTIFs aux clients qui se connectent" -#: cmd_netsync.cc:208 +#: cmd_netsync.cc:201 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1480,7 +1500,7 @@ 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:214 +#: cmd_netsync.cc:207 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1563,7 +1583,11 @@ msgstr[1] "lu %d paquets" msgstr[0] "lu %d paquet" msgstr[1] "lu %d paquets" -#: cmd_ws_commit.cc:45 +#: cmd_ws_commit.cc:43 +msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" +msgstr "" + +#: cmd_ws_commit.cc:46 #, fuzzy msgid "" "Enter a description of this change.\n" @@ -1572,75 +1596,100 @@ 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:71 #, 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:74 +#, fuzzy, c-format +msgid "failed to remove magic line; commit cancelled" +msgstr "message du journal vide; confidence arrêtée" + +#: cmd_ws_commit.cc:80 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:88 #, 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:108 #, c-format msgid "no missing files to revert" msgstr "aucun fichier manquant à rétablir" -#: cmd_ws_commit.cc:150 +#: cmd_ws_commit.cc:163 #, c-format msgid "reverting %s" msgstr "retourne %s à la révision de base" -#: cmd_ws_commit.cc:154 +#: cmd_ws_commit.cc:167 #, 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:180 #, c-format msgid "recreating %s/" msgstr "re-crée %s/" -#: cmd_ws_commit.cc:190 +#: cmd_ws_commit.cc:203 msgid "disapprove of a particular revision" msgstr "désapprouver une révision en particulier" -#: cmd_ws_commit.cc:206 +#: cmd_ws_commit.cc:219 #, 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:210 +#: cmd_ws_commit.cc:223 #, c-format msgid "need --branch argument for disapproval" msgstr "il faut un argument --branch pour désapprouver" -#: cmd_ws_commit.cc:253 +#: cmd_ws_commit.cc:264 +#, fuzzy +msgid "[DIRECTORY...]" +msgstr "[DOSSIER]" + +#: cmd_ws_commit.cc:265 +#, fuzzy +msgid "create one or more directories and add them to the workspace" +msgstr "renommer des entrées dans l'espace de travail" + +#: cmd_ws_commit.cc:285 +#, fuzzy, c-format +msgid "directory '%s' already exists" +msgstr "le fichier « %s » existe déjà" + +#: cmd_ws_commit.cc:292 +#, c-format +msgid "ignoring directory '%s' [see .mtn-ignore]" +msgstr "" + +#: cmd_ws_commit.cc:309 msgid "add files to workspace" msgstr "ajouter des fichiers à l'espace de travail" -#: cmd_ws_commit.cc:260 +#: cmd_ws_commit.cc:316 #, c-format msgid "cannot set '--unknown' and '--recursive' at the same time" msgstr "" -#: cmd_ws_commit.cc:262 +#: cmd_ws_commit.cc:318 #, c-format msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" msgstr "" -#: cmd_ws_commit.cc:294 +#: cmd_ws_commit.cc:350 msgid "drop files from workspace" msgstr "supprimer des fichiers de l'espace de travail" -#: cmd_ws_commit.cc:330 +#: cmd_ws_commit.cc:386 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1648,15 +1697,15 @@ msgstr "" "SOURCE DESTINATION\n" "SOURCE1 [SOURCE2 [...]] DOSSIER_DESTINATION" -#: cmd_ws_commit.cc:332 +#: cmd_ws_commit.cc:388 msgid "rename entries in the workspace" msgstr "renommer des entrées dans l'espace de travail" -#: cmd_ws_commit.cc:354 +#: cmd_ws_commit.cc:410 msgid "NEW_ROOT PUT_OLD" msgstr "RACINE_NOUVELLE PLACE_ANCIENNE" -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:411 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1670,31 +1719,31 @@ msgstr "" "deviendra le dossier appelé PLACE_ANCIENNE.\n" "Il est fortement recommandé d'employer --execute." -#: cmd_ws_commit.cc:373 +#: cmd_ws_commit.cc:429 msgid "show status of workspace" msgstr "afficher l'état de l'espace de travail" -#: cmd_ws_commit.cc:402 +#: cmd_ws_commit.cc:458 #, c-format msgid "Current branch: %s" msgstr "Branche actuelle : %s" -#: cmd_ws_commit.cc:408 +#: cmd_ws_commit.cc:464 #, c-format msgid "Changes against parent %s" msgstr "Changement par rapport au parent %s" -#: cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:469 #, c-format msgid " no changes" msgstr " aucun changement" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:473 #, c-format msgid " dropped %s" msgstr " supprime %s" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:478 #, c-format msgid "" " renamed %s\n" @@ -1703,21 +1752,21 @@ msgstr "" " renomme %s\n" " en %s" -#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 +#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487 #, c-format msgid " added %s" msgstr " ajoute %s" -#: cmd_ws_commit.cc:435 +#: cmd_ws_commit.cc:491 #, c-format msgid " patched %s" msgstr " modifie %s" -#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105 msgid "[DIRECTORY]" msgstr "[DOSSIER]" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:496 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" @@ -1731,47 +1780,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:458 +#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1048 #, 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:466 +#: cmd_ws_commit.cc:522 cmd_ws_commit.cc:1054 #, c-format msgid "branch %s has multiple heads:" msgstr "la branche %s a plusieurs entrées :" -#: cmd_ws_commit.cc:469 +#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057 #, fuzzy, c-format msgid "choose one with '%s checkout -r'" msgstr "choisissez en un avec « %s update -r »\n" -#: cmd_ws_commit.cc:470 +#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058 #, c-format msgid "branch %s has multiple heads" msgstr "la branche %s a plusieurs entrées" -#: cmd_ws_commit.cc:497 +#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041 #, 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:514 +#: cmd_ws_commit.cc:570 #, c-format msgid "you must specify a destination directory" msgstr "vous devez préciser un dossier de destination" -#: cmd_ws_commit.cc:527 +#: cmd_ws_commit.cc:583 #, fuzzy, c-format msgid "checkout directory '%s' already exists" msgstr "le fichier « %s » existe déjà" -#: cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:617 #, 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:579 +#: cmd_ws_commit.cc:635 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1781,45 +1830,45 @@ msgstr "" "get CHEMIN [ATTR]\n" "drop CHEMIN [ATTR]" -#: cmd_ws_commit.cc:580 +#: cmd_ws_commit.cc:636 msgid "set, get or drop file attributes" msgstr "établis, obtiens ou supprime des attributs de fichiers" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:653 #, c-format msgid "Unknown path '%s'" msgstr "Chemin inconnu « %s »" -#: cmd_ws_commit.cc:626 +#: cmd_ws_commit.cc:682 #, 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:656 +#: cmd_ws_commit.cc:712 #, c-format msgid "No attributes for '%s'" msgstr "Pas d'attributs pour « %s »" -#: cmd_ws_commit.cc:667 +#: cmd_ws_commit.cc:723 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Pas d'attribut « %s » pour le chemin « %s »" -#: cmd_ws_commit.cc:680 +#: cmd_ws_commit.cc:736 msgid "commit workspace to database" msgstr "confie un espace de travail à la base de données" -#: cmd_ws_commit.cc:711 +#: cmd_ws_commit.cc:767 #, c-format msgid "no changes to commit" msgstr "aucun changement à confier" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:787 #, fuzzy, c-format msgid "beginning commit on branch '%s'" msgstr "commence à confier sur la branche « %s »\n" -#: cmd_ws_commit.cc:740 +#: cmd_ws_commit.cc:796 #, fuzzy, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1831,37 +1880,37 @@ msgstr "" "veuillez déplacé ou supprimer MT/log,\n" "ou supprimer --message/--message-file de la linge de commande" -#: cmd_ws_commit.cc:755 +#: cmd_ws_commit.cc:811 #, fuzzy, c-format msgid "empty log message; commit canceled" msgstr "message du journal vide; confidence arrêtée" -#: cmd_ws_commit.cc:777 +#: cmd_ws_commit.cc:833 #, c-format msgid "log message rejected by hook: %s" msgstr "entrée du journal rejetée par le hook : %s" -#: cmd_ws_commit.cc:785 +#: cmd_ws_commit.cc:841 #, 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:824 cmd_ws_commit.cc:854 +#: cmd_ws_commit.cc:880 cmd_ws_commit.cc:910 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "le fichier « %s » a été modifié pendant le commit, interruption" -#: cmd_ws_commit.cc:836 +#: cmd_ws_commit.cc:892 #, 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:886 +#: cmd_ws_commit.cc:942 #, c-format msgid "committed revision %s" msgstr "révision %s commitée" -#: cmd_ws_commit.cc:892 +#: cmd_ws_commit.cc:948 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1870,24 +1919,49 @@ 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:926 +#: cmd_ws_commit.cc:982 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:932 +#: cmd_ws_commit.cc:988 #, c-format msgid "need --branch argument for setup" msgstr "setup a besoin d'un argument pour --branch" -#: cmd_ws_commit.cc:949 +#: cmd_ws_commit.cc:1004 +msgid "DIRECTORY" +msgstr "DOSSIER" + +#: cmd_ws_commit.cc:1005 +msgid "import the contents of the given directory tree into a given branch" +msgstr "" + +#: cmd_ws_commit.cc:1016 +#, fuzzy, c-format +msgid "you must specify a directory to import" +msgstr "vous devez préciser un dossier de destination" + +#: cmd_ws_commit.cc:1067 +#, fuzzy, c-format +msgid "import directory '%s' doesn't exists" +msgstr "le dossier « %s » n'existe pas" + +#: cmd_ws_commit.cc:1068 +#, fuzzy, c-format +msgid "import directory '%s' is a file" +msgstr "" +"impossible de créer le dossier « %s »\n" +"car c'est un fichier" + +#: cmd_ws_commit.cc:1106 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" msgstr "" -#: cmd_ws_commit.cc:962 +#: cmd_ws_commit.cc:1119 msgid "refresh the inodeprint cache" msgstr "rafraîchir le cache d'inodeprint" @@ -1970,7 +2044,7 @@ msgstr "marquages" msgid "markings" msgstr "marquages" -#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244 msgid "revisions" msgstr "révisions" @@ -1978,7 +2052,7 @@ msgstr "ancêtre" msgid "ancestry" msgstr "ancêtre" -#: database_check.cc:434 netsync.cc:2973 +#: database_check.cc:434 netsync.cc:3067 msgid "keys" msgstr "clefs" @@ -2434,27 +2508,27 @@ msgstr "voulais %d rangs, reçu %s dans msgid "wanted %d rows got %d in query: %s" msgstr "voulais %d rangs, reçu %s dans la requête: %s\n" -#: database.cc:2040 +#: database.cc:2043 #, c-format msgid "another key with name '%s' already exists" msgstr "une autre clef nommée « %s » existe déjà" -#: database.cc:3037 +#: database.cc:3041 #, c-format msgid "no database specified" msgstr "aucune base de données n'a été spécifiée" -#: database.cc:3045 +#: database.cc:3049 #, c-format msgid "database %s does not exist" msgstr "la base de données %s n'existe pas" -#: database.cc:3046 +#: database.cc:3050 #, c-format msgid "%s is a directory, not a database" msgstr "%s est un dossier, pas une base de données" -#: database.cc:3071 +#: database.cc:3075 #, c-format msgid "could not open database '%s': %s" msgstr "impossible d'ouvrir la base de données « %s » : %s" @@ -2490,7 +2564,7 @@ msgstr "" "[ droite] %s\n" "[fusionné] %s\n" -#: file_io.cc:176 file_io.cc:183 +#: file_io.cc:194 file_io.cc:201 #, c-format msgid "" "could not create directory '%s'\n" @@ -2499,7 +2573,7 @@ msgstr "" "impossible de créer le dossier « %s »\n" "car c'est un fichier" -#: file_io.cc:178 +#: file_io.cc:196 #, c-format msgid "" "could not create directory '%s'\n" @@ -2508,17 +2582,17 @@ msgstr "" "impossible de créer le dossier « %s »\n" "%s" -#: file_io.cc:182 +#: file_io.cc:200 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le dossier « %s »" -#: file_io.cc:195 +#: file_io.cc:213 #, 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:227 #, c-format msgid "" "could not remove '%s'\n" @@ -2527,113 +2601,113 @@ msgstr "" "impossible de supprimer « %s »\n" "%s" -#: file_io.cc:219 +#: file_io.cc:237 #, 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:238 #, 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:246 #, 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:247 #, 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:254 #, 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:262 #, 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:263 #, 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:272 #, 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:273 #, 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:276 file_io.cc:289 #, c-format msgid "rename target '%s' already exists" msgstr "le nouveau nom « %s » existe déjà" -#: file_io.cc:267 +#: file_io.cc:285 #, 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:286 #, 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:300 #, 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:315 #, c-format msgid "file %s does not exist" msgstr "le fichier %s n'existe pas" -#: file_io.cc:298 +#: file_io.cc:316 #, 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:320 #, 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:359 #, 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:390 #, 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:398 #, c-format msgid "cannot open file %s for writing" msgstr "impossible d'ouvrir le fichier %s pour l'écrire" -#: file_io.cc:437 +#: file_io.cc:455 #, 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 work.cc:1079 +#: file_io.cc:548 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "aucun fichier ou dossier de ce type : « %s »" @@ -2678,22 +2752,22 @@ msgstr "la phrase de passe pour « %s  msgid "passphrase for '%s' is incorrect" msgstr "la phrase de passe pour « %s » est incorrecte" -#: lua.cc:462 lua.cc:476 +#: lua.cc:463 lua.cc:477 lua.cc:512 #, c-format msgid "%s called with an invalid parameter" msgstr "%s a été appelé avec un paramètre invalide" -#: lua.cc:479 +#: lua.cc:480 lua.cc:515 #, c-format msgid "Directory '%s' does not exist" msgstr "le dossier « %s » n'existe pas" -#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 +#: lua.cc:481 lua.cc:516 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:500 lua.cc:538 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "erreur lua lors du chargement de « %s »" @@ -2828,47 +2902,47 @@ msgstr "la vérification de « %s » a msgid "check of '%s' failed" msgstr "la vérification de « %s » a échouée" -#: netsync.cc:724 +#: netsync.cc:760 msgid "bytes in" msgstr "octets entrants" # msgstr "octets ⇩" -#: netsync.cc:726 +#: netsync.cc:762 msgid "bytes out" msgstr "octets sortants" # msgstr "octets ⇧" -#: netsync.cc:730 +#: netsync.cc:766 msgid "certs in" msgstr "certifs entrants" # msgstr "certs ⇩" -#: netsync.cc:732 netsync.cc:745 +#: netsync.cc:768 netsync.cc:781 msgid "revs in" msgstr "révs entrantes" # msgstr "révs ⇩" -#: netsync.cc:737 +#: netsync.cc:773 msgid "certs out" msgstr "certifs entrants" # msgstr "certs ⇧" -#: netsync.cc:739 netsync.cc:747 +#: netsync.cc:775 netsync.cc:783 msgid "revs out" msgstr "révs sortantes" # msgstr "révs ⇧" -#: netsync.cc:853 +#: netsync.cc:889 #, c-format msgid "underflow on count of %s items to receive" msgstr "trop peux d'objets %s à recevoir" -#: netsync.cc:1201 +#: netsync.cc:1261 netsync.cc:1269 #, c-format msgid "received network error: %s" msgstr "erreur de réception réseau : %s" -#: netsync.cc:1236 +#: netsync.cc:1304 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2891,12 +2965,12 @@ msgstr "" "j'attendais %s\n" "« %s unset %s %s » pour passer outre cette vérification" -#: netsync.cc:1246 +#: netsync.cc:1314 #, c-format msgid "server key changed" msgstr "la clef du serveur a changé" -#: netsync.cc:1251 +#: netsync.cc:1319 #, fuzzy, c-format msgid "" "first time connecting to server %s\n" @@ -2907,54 +2981,49 @@ msgstr "" "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:1326 #, 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:1429 #, c-format msgid "rejected attempt at anonymous connection for write" msgstr "tentative de connexion anonyme pour écrire rejeté" -#: netsync.cc:1358 +#: netsync.cc:1436 #, 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:1452 #, c-format -msgid "not serving branch '%s'" -msgstr "la branche « %s » n'est pas servie" - -#: 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:1460 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'" msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »" -#: netsync.cc:1391 +#: netsync.cc:1466 #, c-format msgid "allowed anonymous read/write permission for '%s' excluding '%s'" msgstr "permission de lecture anonyme accordée pour « %s » en excluant « %s »" -#: netsync.cc:1447 +#: netsync.cc:1531 +#, 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:1549 #, 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" -#: netsync.cc:1468 +#: netsync.cc:1571 #, 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 -#, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " "sink" @@ -2962,7 +3031,7 @@ msgstr "" "permission de lecture refusée à « %s » pour « %s » en excluant « %s » et en " "étant un puits pure" -#: netsync.cc:1501 +#: netsync.cc:1584 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" @@ -2970,12 +3039,12 @@ msgstr "" "permission de lecture refusée à « %s » pour « %s » en excluant « %s » à " "cause de la branche « %s »" -#: netsync.cc:1511 +#: netsync.cc:1594 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'" msgstr "permission de lecture accordée à « %s » pour « %s » en excluant « %s »" -#: netsync.cc:1521 +#: netsync.cc:1605 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -2984,228 +3053,233 @@ msgstr "" "permission d'écriture refusée à « %s » pour « %s » en excluant « %s » en " "étant un source pure" -#: netsync.cc:1528 +#: netsync.cc:1613 #, 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:1617 #, 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:1641 #, c-format msgid "bad client signature" msgstr "signature du client invalide" -#: netsync.cc:1572 +#: netsync.cc:1657 #, 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:1754 #, c-format msgid "unknown bye phase %d received" msgstr "phase d'aurevoir %d inconnue reçue" -#: netsync.cc:1684 +#: netsync.cc:1769 #, 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:1841 #, 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" -#: netsync.cc:1859 +#: netsync.cc:1945 #, 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:1877 +#: netsync.cc:1963 #, 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:1891 +#: netsync.cc:1977 #, 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:1953 +#: netsync.cc:2039 #, c-format msgid "Received warning from usher: %s" msgstr "Alerte reçu de usher : %s" -#: netsync.cc:2040 netsync.cc:2071 +#: netsync.cc:2126 netsync.cc:2157 msgid "source and sink" msgstr "source et puits" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "source" msgstr "source" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "sink" msgstr "puits" -#: netsync.cc:2228 +#: netsync.cc:2314 #, 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:2240 netsync.cc:2339 +#: netsync.cc:2326 netsync.cc:2425 #, 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:2246 +#: netsync.cc:2332 #, c-format msgid "error: %s" msgstr "erreur : %s" -#: netsync.cc:2310 +#: netsync.cc:2396 #, c-format msgid "connecting to %s" msgstr "connexion à %s" -#: netsync.cc:2354 +#: netsync.cc:2440 #, 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" -#: netsync.cc:2377 +#: netsync.cc:2463 #, 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:2394 +#: netsync.cc:2480 #, c-format msgid "successful exchange with %s" msgstr "échange réussi avec %s" -#: netsync.cc:2400 +#: netsync.cc:2486 #, 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:2405 +#: netsync.cc:2491 #, 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:2471 +#: netsync.cc:2557 #, 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:2503 +#: netsync.cc:2589 #, c-format msgid "accepted new client connection from %s : %s" msgstr "nouvelle connexion d'un client acceptée de %s : %s" -#: netsync.cc:2540 +#: netsync.cc:2626 #, 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:2551 +#: netsync.cc:2637 #, c-format msgid "peer %s read failed in working state (error)" msgstr "" -#: netsync.cc:2556 +#: netsync.cc:2642 #, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)" msgstr "" -#: netsync.cc:2562 +#: netsync.cc:2648 #, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "" -#: netsync.cc:2583 +#: netsync.cc:2669 #, c-format msgid "peer %s write failed in working state (error)" msgstr "" -#: netsync.cc:2588 +#: netsync.cc:2674 #, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)" msgstr "" -#: netsync.cc:2594 +#: netsync.cc:2680 #, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "" -#: netsync.cc:2621 +#: netsync.cc:2707 #, c-format msgid "peer %s processing finished, disconnecting" msgstr "traitement du pair %s terminé, déconnexion" -#: netsync.cc:2643 +#: netsync.cc:2729 #, 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:2711 +#: netsync.cc:2797 #, c-format msgid "beginning service on %s : %s" msgstr "début du service sur %s : %s" -#: netsync.cc:2712 +#: netsync.cc:2798 msgid "" msgstr "" -#: netsync.cc:2726 +#: netsync.cc:2812 #, c-format msgid "session limit %d reached, some connections will be refused" msgstr "" -#: netsync.cc:2791 +#: netsync.cc:2879 +#, fuzzy, c-format +msgid "Network error on peer %s, disconnecting" +msgstr "reçu des données hors-bande du pair %s, déconnexion" + +#: netsync.cc:2885 #, c-format msgid "got OOB from peer %s, disconnecting" msgstr "reçu des données hors-bande du pair %s, déconnexion" -#: netsync.cc:2851 +#: netsync.cc:2945 #, c-format msgid "beginning service on %s" msgstr "début du service sur %s" -#: netsync.cc:2914 +#: netsync.cc:3008 #, 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:2963 +#: netsync.cc:3057 #, c-format msgid "finding items to synchronize:" msgstr "recherche d'éléments à synchroniser :" -#: netsync.cc:2971 +#: netsync.cc:3065 msgid "certificates" msgstr "certificats" -#: netsync.cc:3084 +#: netsync.cc:3178 #, c-format msgid "Cannot find key '%s'" msgstr "Impossible de trouver la clef « %s »" -#: netsync.cc:3124 +#: netsync.cc:3218 #, fuzzy, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -3214,7 +3288,7 @@ msgstr "" "le motif des branches à inclure contient un caractère de citation :\n" "%s\n" -#: netsync.cc:3130 +#: netsync.cc:3224 #, fuzzy, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -3223,7 +3297,7 @@ msgstr "" "le motif des branches à exclure contient un caractère de citation :\n" "%s\n" -#: netsync.cc:3165 netsync.cc:3169 +#: netsync.cc:3259 netsync.cc:3263 #, c-format msgid "network error: %s" msgstr "erreur réseau : %s" @@ -3236,7 +3310,7 @@ msgstr "la taille de bloc en octets pour msgid "block size in bytes for \"automate stdio\" output" msgstr "la taille de bloc en octets pour la sortie « automate stdio »" -#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#: options_list.hh:32 options_list.hh:317 options_list.hh:360 #, fuzzy, c-format msgid "cannot be zero or negative" msgstr "argument illégal à --last : il ne doit pas être nul ou négatif\n" @@ -3318,149 +3392,157 @@ msgstr "" "tout en créent des listes, élimine les attributs signé par la clef donnée" #: options_list.hh:228 +msgid "don't perform the operation, just show what would have happened" +msgstr "" + +#: options_list.hh:236 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 +#: options_list.hh:245 msgid "leave out anything described by its argument" msgstr "exclus tout ce qui est décrit par l'argument" -#: options_list.hh:245 +#: options_list.hh:253 msgid "perform the associated file operation" msgstr "accomplis les opérations sur les fichiers associés" -#: options_list.hh:253 +#: options_list.hh:261 msgid "print detailed version number, then exit" msgstr "afficher le numéro de version détaillée, puis quitte" -#: options_list.hh:260 +#: options_list.hh:268 msgid "display help message" msgstr "afficher le message d'aide" -#: options_list.hh:269 +#: options_list.hh:277 #, fuzzy msgid "include anything described by its argument" msgstr "exclus tout ce qui est décrit par l'argument" -#: options_list.hh:277 +#: options_list.hh:285 msgid "set key for signatures" msgstr "paramétrer la clef pour les signatures" -#: options_list.hh:285 +#: options_list.hh:293 msgid "set location of key store" msgstr "paramétrer l'emplacement de l'entrepôt des clefs" -#: options_list.hh:294 +#: options_list.hh:302 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:304 +#: options_list.hh:312 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:313 +#: options_list.hh:321 msgid "file to write the log to" msgstr "fichier où écrire le journal" -#: options_list.hh:324 +#: options_list.hh:332 msgid "set commit changelog message" msgstr "saisir le message du journal" -#: options_list.hh:331 +#: options_list.hh:339 #, 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 +#: options_list.hh:347 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:347 +#: options_list.hh:355 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:357 +#: options_list.hh:365 msgid "exclude files when printing logs" msgstr "exclure les fichiers en affichant le journal" -#: options_list.hh:365 +#: options_list.hh:373 msgid "do not ignore any files" msgstr "" -#: options_list.hh:373 +#: options_list.hh:381 msgid "exclude merges when printing logs" msgstr "exclure les fusions en affichant le journal" -#: options_list.hh:381 +#: options_list.hh:389 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:389 +#: options_list.hh:397 msgid "do not load standard lua hooks" msgstr "ne pas charger les hooks standards lua" -#: options_list.hh:397 +#: options_list.hh:405 msgid "record process id of server" msgstr "enregistrer l'identifiant du processus serveur" -#: options_list.hh:405 +#: options_list.hh:413 #, fuzzy msgid "suppress verbose, informational and progress messages" msgstr "n'affiche pas le journal ou les messages de progrès" -#: options_list.hh:415 +#: options_list.hh:423 msgid "load extra rc file" msgstr "charger un fichier rc supplémentaire" -#: options_list.hh:423 +#: options_list.hh:431 #, 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 +#: options_list.hh:441 msgid "also operate on the contents of any listed directories" msgstr "" -#: options_list.hh:442 +#: options_list.hh:450 msgid "select revision id for operation" msgstr "choisir une révision pour l'opération" -#: options_list.hh:450 +#: options_list.hh:458 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 +#: options_list.hh:466 msgid "use the current arguments as the future default" msgstr "emploie les arguments actuels comme défauts futurs" -#: options_list.hh:466 +#: options_list.hh:474 msgid "set ticker style (count|dot|none)" msgstr "établis le style d'affichage de progrès (count|dot|none)" -#: options_list.hh:477 +#: options_list.hh:485 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "" -#: options_list.hh:482 +#: options_list.hh:489 +msgid "revision(s) to stop logging at" +msgstr "" + +#: options_list.hh:497 msgid "perform the operations for unknown files from workspace" msgstr "" "accomplis les opérations sur les fichiers inconnus dans l'espace de travail" # **** Richard stopped here **** -#: options_list.hh:490 +#: options_list.hh:506 msgid "verbose completion output" msgstr "affiche plus d'information à la fin de l'exécution" -#: options_list.hh:498 +#: options_list.hh:514 msgid "print version number, then exit" msgstr "afficher le numéro de version, puis quitte" -#: options_list.hh:506 +#: options_list.hh:522 msgid "insert command line arguments taken from the given file" msgstr "fourre les arguments pris du fichier donné dans la linge de commande" @@ -3578,6 +3660,28 @@ msgstr "étiquettes" msgid "tags" msgstr "étiquettes" +#: restrictions.cc:60 restrictions.cc:77 +#, c-format +msgid "conflicting include/exclude on path '%s'" +msgstr "" + +#: restrictions.cc:103 restrictions.cc:141 +#, fuzzy, c-format +msgid "restriction includes unknown path '%s'" +msgstr "chemin inconnu « %s »\n" + +#: restrictions.cc:114 restrictions.cc:155 +#, fuzzy, c-format +msgid "restriction excludes unknown path '%s'" +msgstr "chemin inconnu « %s »\n" + +#: restrictions.cc:118 restrictions.cc:159 +#, fuzzy, c-format +msgid "%d unknown path" +msgid_plural "%d unknown paths" +msgstr[0] "chemin inconnu « %s »\n" +msgstr[1] "chemin inconnu « %s »\n" + #: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" @@ -4173,6 +4277,18 @@ msgstr "" "cet espace de travail est dans le format actuel, aucune migration n'est " "nécessaire" +#~ msgid "read from client failed with error code: %d" +#~ msgstr "la lecture depuis le client a échoué avec le code d'erreur : %d" + +#~ msgid "no hostname given" +#~ msgstr "aucun nom d'hôte fourni" + +#~ msgid "PATTERN ..." +#~ msgstr "CHEMIN ..." + +#~ msgid "not serving branch '%s'" +#~ msgstr "la branche « %s » n'est pas servie" + #~ msgid "failed to parse date string '%s': %s" #~ msgstr "échou de comprendre la date « %s » : %s" @@ -4276,9 +4392,6 @@ msgstr "" #~ msgid "updating %s" #~ msgstr "mise à jour de %s en %s" -#~ msgid "unknown path '%s'\n" -#~ msgstr "chemin inconnu « %s »\n" - #~ msgid "negative or zero last not allowed\n" #~ msgstr "« last » négative ou zéro interdite\n" @@ -4429,9 +4542,6 @@ msgstr "" #~ msgid "SRC DST" #~ msgstr "SRC DST" -#~ msgid "DIRECTORY" -#~ msgstr "DOSSIER" - #~ msgid "rebuild the indices used to sync over the network" #~ msgstr "" #~ "reconstruction des index utilisés pour la synchronisation par le réseau" ============================================================ --- po/it.po 3e7df086f5ded8f102e24e476e09d5b077532dec +++ po/it.po 52c5dbefd1dafeeee8e1e1ea53d76bee4dede67e @@ -1,8 +1,8 @@ msgstr "" msgid "" msgstr "" "Project-Id-Version: monotone\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-14 23:43+0100\n" +"POT-Creation-Date: 2006-12-15 00:27+0100\n" "PO-Revision-Date: 2006-11-21 09:36+0100\n" "Last-Translator: Lapo Luchini \n" "Language-Team: Lapo Luchini \n" @@ -44,56 +44,28 @@ msgstr "[RAMO]" msgid "[BRANCH]" msgstr "[RAMO]" -#: automate.cc:67 -#: automate.cc:91 -#: automate.cc:138 -#: automate.cc:218 -#: automate.cc:359 -#: automate.cc:426 -#: automate.cc:451 -#: automate.cc:529 -#: automate.cc:898 -#: automate.cc:1028 -#: automate.cc:1072 -#: automate.cc:1098 -#: automate.cc:1125 -#: automate.cc:1152 -#: automate.cc:1186 -#: automate.cc:1297 -#: automate.cc:1394 -#: automate.cc:1453 -#: automate.cc:1499 -#: automate.cc:1559 -#: cmd_files.cc:253 -#: cmd_files.cc:276 -#: cmd_list.cc:656 +#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218 +#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529 +#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098 +#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297 +#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559 +#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656 #, c-format msgid "wrong argument count" msgstr "numero errato di argomenti" -#: automate.cc:88 -#: automate.cc:135 -#: automate.cc:1183 +#: automate.cc:88 automate.cc:135 automate.cc:1183 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "REV_1 [REV_2 [REV_3 […]]]" -#: automate.cc:98 -#: automate.cc:145 -#: automate.cc:189 -#: automate.cc:330 -#: automate.cc:365 -#: automate.cc:369 -#: automate.cc:429 -#: automate.cc:454 -#: automate.cc:1193 -#: cmd_list.cc:663 -#: revision.cc:1705 +#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:330 +#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454 +#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "La revisione %s non esiste" -#: automate.cc:183 -#: automate.cc:324 +#: automate.cc:183 automate.cc:324 msgid "[REV1 [REV2 [REV3 [...]]]]" msgstr "[REV_1 [REV_2 [REV_3 […]]]]" @@ -110,23 +82,14 @@ msgstr "NUOVA_REV [VECCHIA_REV_1 [VECCHI msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "NUOVA_REV [VECCHIA_REV_1 [VECCHIA_REV_2 [...]]]" -#: automate.cc:398 -#: automate.cc:486 -#: automate.cc:711 -#: automate.cc:942 -#: automate.cc:963 -#: automate.cc:1249 -#: cmd_automate.cc:78 -#: cmd_automate.cc:333 +#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942 +#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332 #: cmd_list.cc:564 #, c-format msgid "no arguments needed" msgstr "nessun argomento richiesto" -#: automate.cc:423 -#: automate.cc:448 -#: cmd_list.cc:653 -#: revision.cc:1699 +#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699 msgid "REV" msgstr "REV" @@ -134,48 +97,30 @@ msgstr "SELETTORE" msgid "SELECTOR" msgstr "SELETTORE" -#: automate.cc:895 -#: automate.cc:1025 +#: automate.cc:895 automate.cc:1025 msgid "[REVID]" msgstr "[ID_REV]" -#: automate.cc:924 -#: automate.cc:1047 -#: automate.cc:1507 -#: automate.cc:1566 +#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566 #: automate.cc:1571 #, c-format msgid "no revision %s found in database" msgstr "nel database non è presente la revisione %s" -#: automate.cc:1069 -#: automate.cc:1095 -#: cmd_merging.cc:845 +#: automate.cc:1069 automate.cc:1095 cmd_merging.cc:845 msgid "REVID" msgstr "ID_REV" -#: automate.cc:1080 -#: automate.cc:1106 -#: automate.cc:1161 -#: automate.cc:1163 -#: 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:197 -#: cmd_merging.cc:125 -#: cmd_merging.cc:677 -#: cmd_merging.cc:692 -#: cmd_merging.cc:695 -#: cmd_ws_commit.cc:479 -#: commands.cc:413 +#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163 +#: 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:197 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535 +#: cmd_ws_commit.cc:1023 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "la revisione %s non esiste" -#: automate.cc:1122 -#: cmd_files.cc:250 +#: automate.cc:1122 cmd_files.cc:250 msgid "FILEID" msgstr "ID_FILE" @@ -196,20 +141,17 @@ msgstr "ID_CHIAVE PASSPHRASE" msgid "KEYID PASSPHRASE" msgstr "ID_CHIAVE PASSPHRASE" -#: automate.cc:1409 -#: cmd_key_cert.cc:42 +#: automate.cc:1409 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "chiave ‘%s’ già esistente" -#: automate.cc:1412 -#: cmd_key_cert.cc:45 +#: automate.cc:1412 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "genero la coppia di chiavi ‘%s’" -#: automate.cc:1414 -#: cmd_key_cert.cc:47 +#: automate.cc:1414 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "immagazzino la coppia di chiavi ‘%s’ in ‘%s/’" @@ -227,8 +169,7 @@ msgstr "REV FILE" msgid "REV FILE" msgstr "REV FILE" -#: automate.cc:1513 -#: automate.cc:1577 +#: automate.cc:1513 automate.cc:1577 #, c-format msgid "file %s is unknown for revision %s" msgstr "il file ‘%s’ è sconosciuto per la revisione %s" @@ -267,8 +208,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’" @@ -294,17 +234,23 @@ 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:150 #, fuzzy, c-format @@ -312,35 +258,30 @@ msgstr "Input non valido per ‘automate msgstr "Input non valido per ‘automate stdio’" #: cmd_automate.cc:169 -#, c-format -msgid "read from client failed with error code: %d" -msgstr "lettura dal client fallita con codice di errore: %d" - -#: cmd_automate.cc:170 #, fuzzy, c-format msgid "Bad input to automate stdio: unexpected EOF" msgstr "Input non valido per ‘automate stdio’" -#: cmd_automate.cc:198 +#: cmd_automate.cc:197 #, fuzzy, c-format msgid "Bad input to automate stdio: unknown start token '%c'" msgstr "Input non valido per ‘automate stdio’" -#: cmd_automate.cc:220 +#: cmd_automate.cc:219 #, fuzzy, c-format msgid "Bad input to automate stdio: expected '%c' token" msgstr "Input non valido per ‘automate stdio’" -#: cmd_automate.cc:345 +#: cmd_automate.cc:344 #, fuzzy, c-format msgid "Bad input to automate stdio: command name is missing" msgstr "Input non valido per ‘automate stdio’" -#: cmd_automate.cc:374 +#: cmd_automate.cc:373 msgid "automation" msgstr "automazione" -#: cmd_automate.cc:375 +#: cmd_automate.cc:374 msgid "automation interface" msgstr "interfaccia di automazione" @@ -397,8 +338,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" @@ -408,7 +348,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" @@ -423,14 +364,8 @@ 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:465 -#: cmd_diff_log.cc:603 -#: cmd_files.cc:114 -#: cmd_files.cc:220 -#: cmd_list.cc:458 -#: cmd_merging.cc:614 -#: cmd_ws_commit.cc:373 +#: cmd_db.cc:155 cmd_diff_log.cc:465 cmd_diff_log.cc:603 cmd_files.cc:114 +#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429 #: commands.cc:275 msgid "informative" msgstr "informativo" @@ -453,12 +388,8 @@ msgstr "" 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 +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 +#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735 msgid "[PATH]..." msgstr "[PERCORSO…]" @@ -504,17 +435,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:616 +#: cmd_diff_log.cc:617 #, 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" @@ -604,14 +531,12 @@ msgstr "nel database non è presente alc msgid "no file version %s found in database" msgstr "nel database non è presente alcun file con versione ‘%s’" -#: cmd_files.cc:210 -#: cmd_files.cc:214 +#: cmd_files.cc:210 cmd_files.cc:214 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "nessun file ‘%s’ trovato nella revisione %s" -#: cmd_files.cc:221 -#: cmd_files.cc:273 +#: cmd_files.cc:221 cmd_files.cc:273 msgid "FILENAME" msgstr "NOMEFILE" @@ -644,17 +569,12 @@ msgstr "Alias per %s" msgid "Alias for %s" msgstr "Alias per %s" -#: 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 +#: 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:52 -#: cmd_key_cert.cc:92 +#: cmd_key_cert.cc:26 cmd_key_cert.cc:52 cmd_key_cert.cc:92 msgid "KEYID" msgstr "IDCHIAVE" @@ -679,12 +599,18 @@ msgid "public or private key '%s' does n #: 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: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:93 msgid "change passphrase of a private RSA key" @@ -743,11 +669,8 @@ msgstr "NON fidato" msgid "UNtrusted" msgstr "NON fidato" -#: 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 +#: cmd_key_cert.cc:197 cmd_key_cert.cc:210 cmd_key_cert.cc:223 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202 msgid "review" msgstr "verifica" @@ -768,8 +691,7 @@ msgstr "annota i risultati dell'esecuzio 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:223 -#: cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202 msgid "REVISION" msgstr "REVISIONE" @@ -800,8 +722,7 @@ msgstr "commento vuoto" msgid "empty comment" msgstr "commento vuoto" -#: cmd_list.cc:64 -#: cmd_list.cc:677 +#: cmd_list.cc:64 cmd_list.cc:677 #, c-format msgid "no public key '%s' found in database" msgstr "la chiave pubblica ‘%s’ non è nel database" @@ -888,15 +809,10 @@ 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: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 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349 +#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635 +#: cmd_ws_commit.cc:735 msgid "workspace" msgstr "spazio di lavoro" @@ -910,14 +826,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 @@ -1008,21 +927,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:439 -#: cmd_ws_commit.cc:925 -#: cmd_ws_commit.cc:948 -#: cmd_ws_commit.cc:962 +#: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588 +#: cmd_merging.cc:821 cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 +#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119 msgid "tree" msgstr "albero" @@ -1030,17 +942,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:463 +#: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 +#: cmd_ws_commit.cc:519 #, c-format msgid "branch '%s' is empty" msgstr "il ramo ‘%s’ è vuoto" @@ -1057,8 +965,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:" @@ -1089,8 +996,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" @@ -1136,15 +1042,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" @@ -1154,11 +1061,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." @@ -1290,37 +1199,38 @@ msgid "no branch pattern given and no de #: cmd_netsync.cc:93 #, 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:109 -#: cmd_netsync.cc:123 -#: cmd_netsync.cc:138 -#: cmd_netsync.cc:184 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184 msgid "network" msgstr "rete" -#: cmd_netsync.cc:109 -#: cmd_netsync.cc:123 -#: cmd_netsync.cc:138 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[INDIRIZZO[:NUMERO_PORTA] [PATTERN]]" #: cmd_netsync.cc:110 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:124 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:132 #, 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:139 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:160 #, c-format @@ -1338,13 +1248,18 @@ msgstr "" #: cmd_netsync.cc:201 #, 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:207 #, 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..." @@ -1353,7 +1268,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 @@ -1368,14 +1284,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" @@ -1420,7 +1333,11 @@ msgstr[1] "letti %d pacchetto" msgstr[0] "letto %d pacchetto" msgstr[1] "letti %d pacchetto" -#: cmd_ws_commit.cc:45 +#: cmd_ws_commit.cc:43 +msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" +msgstr "" + +#: cmd_ws_commit.cc:46 msgid "" "Enter a description of this change.\n" "Lines beginning with `MTN:' are removed automatically." @@ -1428,74 +1345,100 @@ msgstr "" "Inserisci una descrizione di questa modifica.\n" "Le linee che iniziano con 'MTN:' verranno rimosse automaticamente." -#: cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:71 #, c-format msgid "edit of log message failed" msgstr "modifica del messaggio di log fallita" -#: cmd_ws_commit.cc:67 +#: cmd_ws_commit.cc:74 +#, fuzzy, c-format +msgid "failed to remove magic line; commit cancelled" +msgstr "messaggio di log vuoto; salvataggio annullato" + +#: cmd_ws_commit.cc:80 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "recupera file, directory o l'intero spazio di lavoro (\".\")" -#: cmd_ws_commit.cc:75 +#: cmd_ws_commit.cc:88 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "‘revert’ richiede almeno un path su cui lavorare (eventualmente ‘.’)" -#: cmd_ws_commit.cc:95 +#: cmd_ws_commit.cc:108 #, c-format msgid "no missing files to revert" msgstr "nessun file mancante da recuperare" -#: cmd_ws_commit.cc:150 +#: cmd_ws_commit.cc:163 #, c-format msgid "reverting %s" msgstr "recupero ‘%s’" -#: cmd_ws_commit.cc:154 +#: cmd_ws_commit.cc:167 #, c-format msgid "no file version %s found in database for %s" msgstr "nessun file con versione ‘%s’ trovato per ‘%s’ in database" -#: cmd_ws_commit.cc:167 +#: cmd_ws_commit.cc:180 #, c-format msgid "recreating %s/" msgstr "ri-creo ‘%s/’" -#: cmd_ws_commit.cc:190 +#: cmd_ws_commit.cc:203 msgid "disapprove of a particular revision" msgstr "disapprova una particolare revisione" # TODO: invert? -#: cmd_ws_commit.cc:206 +#: cmd_ws_commit.cc:219 #, 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:210 +#: cmd_ws_commit.cc:223 #, c-format msgid "need --branch argument for disapproval" msgstr "per ‘disapprove’ è necessario un argomento ‘--branch=RAMO’" -#: cmd_ws_commit.cc:253 +#: cmd_ws_commit.cc:264 +#, fuzzy +msgid "[DIRECTORY...]" +msgstr "[DIRECTORY]" + +#: cmd_ws_commit.cc:265 +#, fuzzy +msgid "create one or more directories and add them to the workspace" +msgstr "rinomina elementi dello spazio di lavoro" + +#: cmd_ws_commit.cc:285 +#, fuzzy, c-format +msgid "directory '%s' already exists" +msgstr "" +"la directory ‘%s’ esiste già, non può essere utilizzata per il ‘checkout’" + +#: cmd_ws_commit.cc:292 +#, c-format +msgid "ignoring directory '%s' [see .mtn-ignore]" +msgstr "" + +#: cmd_ws_commit.cc:309 msgid "add files to workspace" msgstr "aggiunge file allo spazio di lavoro" -#: cmd_ws_commit.cc:260 +#: cmd_ws_commit.cc:316 #, c-format msgid "cannot set '--unknown' and '--recursive' at the same time" msgstr "" -#: cmd_ws_commit.cc:262 +#: cmd_ws_commit.cc:318 #, c-format msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" msgstr "" -#: cmd_ws_commit.cc:294 +#: cmd_ws_commit.cc:350 msgid "drop files from workspace" msgstr "toglie file dallo spazio di lavoro" -#: cmd_ws_commit.cc:330 +#: cmd_ws_commit.cc:386 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1503,15 +1446,15 @@ msgstr "" "SORG DEST\n" "SORG1 [SORG2 […]] CART_DEST" -#: cmd_ws_commit.cc:332 +#: cmd_ws_commit.cc:388 msgid "rename entries in the workspace" msgstr "rinomina elementi dello spazio di lavoro" -#: cmd_ws_commit.cc:354 +#: cmd_ws_commit.cc:410 msgid "NEW_ROOT PUT_OLD" msgstr "NUOVA_ROOT METTI_VECCHIA" -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:411 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1525,31 +1468,31 @@ msgstr "" "avrà il nome PUT_OLD.\n" "È fortemente consigliato l'uso di ‘--execute’." -#: cmd_ws_commit.cc:373 +#: cmd_ws_commit.cc:429 msgid "show status of workspace" msgstr "mostra stato dello spazio di lavoro" -#: cmd_ws_commit.cc:402 +#: cmd_ws_commit.cc:458 #, c-format msgid "Current branch: %s" msgstr "Ramo attuale: %s" -#: cmd_ws_commit.cc:408 +#: cmd_ws_commit.cc:464 #, c-format msgid "Changes against parent %s" msgstr "Modifiche rispetto al genitore %s" -#: cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:469 #, c-format msgid " no changes" msgstr " nessun cambiamento" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:473 #, c-format msgid " dropped %s" msgstr " eliminato %s" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:478 #, c-format msgid "" " renamed %s\n" @@ -1558,24 +1501,21 @@ msgstr "" " rinominato %s\n" " in %s" -#: cmd_ws_commit.cc:427 -#: cmd_ws_commit.cc:431 +#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487 #, c-format msgid " added %s" msgstr " aggiunto %s" -#: cmd_ws_commit.cc:435 +#: cmd_ws_commit.cc:491 #, c-format msgid " patched %s" msgstr " modificato %s" -#: cmd_ws_commit.cc:439 -#: cmd_ws_commit.cc:925 -#: cmd_ws_commit.cc:948 +#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105 msgid "[DIRECTORY]" msgstr "[DIRECTORY]" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:496 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" @@ -1585,50 +1525,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:458 +#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1048 #, 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:466 +#: cmd_ws_commit.cc:522 cmd_ws_commit.cc:1054 #, c-format msgid "branch %s has multiple heads:" msgstr "il ramo ‘%s’ ha più teste:" -#: cmd_ws_commit.cc:469 +#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057 #, c-format msgid "choose one with '%s checkout -r'" msgstr "scegline una con ‘%s checkout -r’" -#: cmd_ws_commit.cc:470 +#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058 #, c-format msgid "branch %s has multiple heads" msgstr "il ramo ‘%s’ ha più teste" -#: cmd_ws_commit.cc:497 +#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041 #, 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:514 +#: cmd_ws_commit.cc:570 #, c-format msgid "you must specify a destination directory" msgstr "devi specificare una directory di destinazione" -#: cmd_ws_commit.cc:527 +#: cmd_ws_commit.cc:583 #, 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:561 +#: cmd_ws_commit.cc:617 #, c-format msgid "no file %s found in database for %s" msgstr "nessun file ‘%s’ trovato per ‘%s’ in database" -#: cmd_ws_commit.cc:579 +#: cmd_ws_commit.cc:635 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1638,87 +1582,87 @@ msgstr "" "get PERCORSO [ATTR]\n" "drop PERCORSO [ATTR]" -#: cmd_ws_commit.cc:580 +#: cmd_ws_commit.cc:636 msgid "set, get or drop file attributes" msgstr "imposta, legge o elimina attributi sui file" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:653 #, c-format msgid "Unknown path '%s'" msgstr "Percorso sconosciuto ‘%s’" -#: cmd_ws_commit.cc:626 +#: cmd_ws_commit.cc:682 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Il percorso ‘%s’ non ha l'attributo ‘%s’" -#: cmd_ws_commit.cc:656 +#: cmd_ws_commit.cc:712 #, c-format msgid "No attributes for '%s'" msgstr "Nessun attributo per ‘%s’" -#: cmd_ws_commit.cc:667 +#: cmd_ws_commit.cc:723 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Nessun attributo ‘%s’ nel percorso ‘%s’" -#: cmd_ws_commit.cc:680 +#: cmd_ws_commit.cc:736 msgid "commit workspace to database" msgstr "salvataggio dello spazio di lavoro nel database" -#: cmd_ws_commit.cc:711 +#: cmd_ws_commit.cc:767 #, c-format msgid "no changes to commit" msgstr "nessuna modifica da salvare" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:787 #, c-format msgid "beginning commit on branch '%s'" msgstr "inizio il commit sul ramo ‘%s’" -#: cmd_ws_commit.cc:740 +#: cmd_ws_commit.cc:796 #, 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:755 +#: cmd_ws_commit.cc:811 #, c-format msgid "empty log message; commit canceled" msgstr "messaggio di log vuoto; salvataggio annullato" -#: cmd_ws_commit.cc:777 +#: cmd_ws_commit.cc:833 #, c-format msgid "log message rejected by hook: %s" msgstr "messaggio di log respinto dall'hook: %s" -#: cmd_ws_commit.cc:785 +#: cmd_ws_commit.cc:841 #, c-format msgid "revision %s already in database" msgstr "la revisione %s è già nel database" -#: cmd_ws_commit.cc:824 -#: cmd_ws_commit.cc:854 +#: cmd_ws_commit.cc:880 cmd_ws_commit.cc:910 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "file ‘%s’ modificato durante il commit, abbandono" -#: cmd_ws_commit.cc:836 +#: cmd_ws_commit.cc:892 #, 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:886 +#: cmd_ws_commit.cc:942 #, c-format msgid "committed revision %s" msgstr "salvato come revisione %s" -#: cmd_ws_commit.cc:892 +#: cmd_ws_commit.cc:948 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1727,25 +1671,54 @@ msgstr "" "nota: questa revisione crea una divergenza\n" "nota: potresti voler (o non voler) eseguire ‘%s merge’" -#: cmd_ws_commit.cc:926 +#: cmd_ws_commit.cc:982 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:932 +#: cmd_ws_commit.cc:988 #, c-format msgid "need --branch argument for setup" msgstr "per il ‘setup’ è necessario un argomento ‘--branch=RAMO’" -#: cmd_ws_commit.cc:949 -msgid "migrate a workspace directory's metadata to the latest format; defaults to the current workspace" +#: cmd_ws_commit.cc:1004 +#, fuzzy +msgid "DIRECTORY" +msgstr "[DIRECTORY]" + +#: cmd_ws_commit.cc:1005 +msgid "import the contents of the given directory tree into a given branch" msgstr "" -#: cmd_ws_commit.cc:962 +#: cmd_ws_commit.cc:1016 +#, fuzzy, c-format +msgid "you must specify a directory to import" +msgstr "devi specificare una directory di destinazione" + +#: cmd_ws_commit.cc:1067 +#, fuzzy, c-format +msgid "import directory '%s' doesn't exists" +msgstr "La directory ‘%s’ non esiste" + +#: cmd_ws_commit.cc:1068 +#, fuzzy, c-format +msgid "import directory '%s' is a file" +msgstr "" +"non riesco a creare la directory‘%s’\n" +"è un file" + +#: cmd_ws_commit.cc:1106 +msgid "" +"migrate a workspace directory's metadata to the latest format; defaults to " +"the current workspace" +msgstr "" + +#: cmd_ws_commit.cc:1119 msgid "refresh the inodeprint cache" msgstr "aggiorna la cache degli inodeprint" -#: commands.cc:139 -#: commands.cc:241 +#: commands.cc:139 commands.cc:241 #, c-format msgid "unknown command '%s'" msgstr "comando ‘%s’ sconosciuto" @@ -1822,9 +1795,7 @@ msgstr "contrassegni" msgid "markings" msgstr "contrassegni" -#: database_check.cc:306 -#: netsync.cc:3063 -#: rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244 msgid "revisions" msgstr "revisioni" @@ -1832,8 +1803,7 @@ msgstr "ascendenza" msgid "ancestry" msgstr "ascendenza" -#: database_check.cc:434 -#: netsync.cc:3067 +#: database_check.cc:434 netsync.cc:3067 msgid "keys" msgstr "chiavi" @@ -1876,8 +1846,13 @@ msgstr "roster ‘%s’ incompleto (%d r #: 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:666 #, c-format @@ -1908,13 +1883,16 @@ msgid "revision %s mismatched parents (% #: 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: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:719 #, c-format @@ -1925,7 +1903,8 @@ msgid "revision %s is not parseable (per #: 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:733 #, c-format @@ -1940,7 +1919,9 @@ msgid "revision %s unchecked signature i #: 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:798 #, c-format @@ -1955,7 +1936,9 @@ msgid "revision %s mismatched certs (%d #: 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:846 #, c-format @@ -2074,8 +2057,12 @@ msgstr "%d altezze errate" #: 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" +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 @@ -2161,10 +2148,10 @@ msgid "database %s is not an sqlite vers #: 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:293 -#: 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" @@ -2172,8 +2159,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:297 -#: schema_migration.cc:206 +#: database.cc:297 schema_migration.cc:206 #, c-format msgid "" "sqlite error: %s\n" @@ -2190,7 +2176,8 @@ msgid "" #: 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 "" @@ -2274,27 +2261,27 @@ msgstr "mi aspettavo %d linee e ne ho ot msgid "wanted %d rows got %d in query: %s" msgstr "mi aspettavo %d linee e ne ho ottenute %d nella query ‘%s’" -#: database.cc:2040 +#: database.cc:2043 #, c-format msgid "another key with name '%s' already exists" msgstr "esiste già un'altra chiave con nome ‘%s’" -#: database.cc:3037 +#: database.cc:3041 #, c-format msgid "no database specified" msgstr "nessuna database specificato" -#: database.cc:3045 +#: database.cc:3049 #, c-format msgid "database %s does not exist" msgstr "il database ‘%s’ non esiste" -#: database.cc:3046 +#: database.cc:3050 #, c-format msgid "%s is a directory, not a database" msgstr "‘%s’ è una directory, non un database" -#: database.cc:3071 +#: database.cc:3075 #, c-format msgid "could not open database '%s': %s" msgstr "non riesco ad aprire il database ‘%s’: %s" @@ -2329,8 +2316,7 @@ msgstr "" "[ destra] %s\n" "[ unione] %s" -#: file_io.cc:176 -#: file_io.cc:183 +#: file_io.cc:194 file_io.cc:201 #, c-format msgid "" "could not create directory '%s'\n" @@ -2339,7 +2325,7 @@ msgstr "" "non riesco a creare la directory‘%s’\n" "è un file" -#: file_io.cc:178 +#: file_io.cc:196 #, c-format msgid "" "could not create directory '%s'\n" @@ -2348,17 +2334,17 @@ msgstr "" "non riesco a creare la directory‘%s’\n" "%s" -#: file_io.cc:182 +#: file_io.cc:200 #, c-format msgid "could not create directory '%s'" msgstr "non riesco a creare la directory‘%s’" -#: file_io.cc:195 +#: file_io.cc:213 #, c-format msgid "failed to create directory '%s' for '%s'" msgstr "fallita la creazione della directory‘%s’ per ‘%s’" -#: file_io.cc:209 +#: file_io.cc:227 #, c-format msgid "" "could not remove '%s'\n" @@ -2367,109 +2353,108 @@ msgstr "" "non posso cancellare ‘%s’\n" "%s" -#: file_io.cc:219 +#: file_io.cc:237 #, c-format msgid "file to delete '%s' does not exist" msgstr "il file da cancellare ‘%s’ non esiste" -#: file_io.cc:220 +#: file_io.cc:238 #, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "il file da cancellare ‘%s’ non è un file ma una directory" -#: file_io.cc:228 +#: file_io.cc:246 #, c-format msgid "directory to delete '%s' does not exist" msgstr "la directory da cancellare ‘%s’ non esiste" -#: file_io.cc:229 +#: file_io.cc:247 #, c-format msgid "directory to delete, '%s', is not a directory but a file" msgstr "la directory da cancellare ‘%s’ non è una directory ma un file" -#: file_io.cc:236 +#: file_io.cc:254 #, c-format msgid "object to delete, '%s', does not exist" msgstr "l'oggetto da cancellare ‘%s’ non esiste" -#: file_io.cc:244 +#: file_io.cc:262 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "la directory da cancellare ‘%s’ non esiste" -#: file_io.cc:245 +#: file_io.cc:263 #, c-format msgid "directory to delete, '%s', is a file" msgstr "la directory da cancellare ‘%s’ è un file" -#: file_io.cc:254 +#: file_io.cc:272 #, c-format msgid "rename source file '%s' does not exist" msgstr "il file da rinominare ‘%s’ non esiste" -#: file_io.cc:255 +#: file_io.cc:273 #, 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:276 file_io.cc:289 #, c-format msgid "rename target '%s' already exists" msgstr "esiste già un'altra chiave con nome ‘%s’" -#: file_io.cc:267 +#: file_io.cc:285 #, c-format msgid "rename source dir '%s' does not exist" msgstr "la directory da rinominare ‘%s’ non esiste" -#: file_io.cc:268 +#: file_io.cc:286 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" msgstr "la directory sorgente da rinominare ‘%s’ è un file -- bug in monotone?" -#: file_io.cc:282 +#: file_io.cc:300 #, c-format msgid "rename source path '%s' does not exist" msgstr "il percorso da rinominare ‘%s’ non esiste" -#: file_io.cc:297 +#: file_io.cc:315 #, c-format msgid "file %s does not exist" msgstr "il file ‘%s’ non esiste" -#: file_io.cc:298 +#: file_io.cc:316 #, c-format msgid "file %s cannot be read as data; it is a directory" msgstr "il file ‘%s’ non può essere letto: è una directory" -#: file_io.cc:302 +#: file_io.cc:320 #, c-format msgid "cannot open file %s for reading" msgstr "non riesco ad aprire file ‘%s’ in lettura" -#: file_io.cc:341 +#: file_io.cc:359 #, c-format msgid "Cannot read standard input multiple times" msgstr "Non posso leggere stdin più volte" -#: file_io.cc:372 +#: file_io.cc:390 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "il file ‘%s’ non può essere sovrascritto: è una directory" -#: file_io.cc:380 +#: file_io.cc:398 #, c-format msgid "cannot open file %s for writing" msgstr "impossibile aprire il file ‘%s’ in scrittura" -#: file_io.cc:437 +#: file_io.cc:455 #, c-format msgid "caught runtime error %s constructing file path for %s" msgstr "" -#: file_io.cc:530 -#: work.cc:1079 +#: file_io.cc:548 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "nessun file o directory con nome ‘%s’" @@ -2494,8 +2479,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" @@ -2515,29 +2499,22 @@ msgstr "passphrase incorretta per ‘%sâ msgid "passphrase for '%s' is incorrect" msgstr "passphrase incorretta per ‘%s’" -#: lua.cc:463 -#: lua.cc:477 -#: lua.cc:512 +#: lua.cc:463 lua.cc:477 lua.cc:512 #, c-format msgid "%s called with an invalid parameter" msgstr "‘%s’ chiamato con un parametro non valido" -#: lua.cc:480 -#: lua.cc:515 +#: lua.cc:480 lua.cc:515 #, c-format msgid "Directory '%s' does not exist" msgstr "La directory ‘%s’ non esiste" -#: lua.cc:481 -#: lua.cc:516 -#: rcs_import.cc:1235 -#: work.cc:1334 +#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "‘%s’ non è una directory" -#: lua.cc:500 -#: lua.cc:538 +#: lua.cc:500 lua.cc:538 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "errore lua caricando il file rc ‘%s’" @@ -2616,11 +2593,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 @@ -2634,21 +2615,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***" @@ -2661,7 +2639,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 @@ -2685,8 +2665,7 @@ msgstr "cert. ↓" msgid "certs in" msgstr "cert. ↓" -#: netsync.cc:768 -#: netsync.cc:781 +#: netsync.cc:768 netsync.cc:781 msgid "revs in" msgstr "rev. ↓" @@ -2694,8 +2673,7 @@ msgstr "cert. ↑" msgid "certs out" msgstr "cert. ↑" -#: netsync.cc:775 -#: netsync.cc:783 +#: netsync.cc:775 netsync.cc:783 msgid "revs out" msgstr "rev. ↑" @@ -2704,8 +2682,7 @@ msgstr "" msgid "underflow on count of %s items to receive" msgstr "" -#: netsync.cc:1261 -#: netsync.cc:1269 +#: netsync.cc:1261 netsync.cc:1269 #, c-format msgid "received network error: %s" msgstr "ricevuto errore di rete: %s" @@ -2775,7 +2752,8 @@ msgid "allowed anonymous read/write perm #: netsync.cc:1466 #, 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:1531 #, c-format @@ -2789,13 +2767,20 @@ msgstr "individuato attacco replay nell' #: netsync.cc:1571 #, 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:1584 #, 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:1594 #, c-format @@ -2804,8 +2789,12 @@ msgstr "concessi a ‘%s’ permessi di #: netsync.cc:1605 #, 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:1613 #, c-format @@ -2845,12 +2834,16 @@ msgid "Mismatched epoch on branch %s. Se #: netsync.cc:1945 #, 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:1963 #, 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:1977 #, c-format @@ -2862,18 +2855,15 @@ msgstr "Ricevuto avvertimento dall'uscie msgid "Received warning from usher: %s" msgstr "Ricevuto avvertimento dall'usciere: %s" -#: netsync.cc:2126 -#: netsync.cc:2157 +#: netsync.cc:2126 netsync.cc:2157 msgid "source and sink" msgstr "sorgente e pozzo" -#: netsync.cc:2127 -#: netsync.cc:2158 +#: netsync.cc:2127 netsync.cc:2158 msgid "source" msgstr "sorgente" -#: netsync.cc:2127 -#: netsync.cc:2158 +#: netsync.cc:2127 netsync.cc:2158 msgid "sink" msgstr "pozzo" @@ -2882,8 +2872,7 @@ msgstr "" msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "" -#: netsync.cc:2326 -#: netsync.cc:2425 +#: netsync.cc:2326 netsync.cc:2425 #, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "errore di protocollo processando il peer %s: ‘%s’" @@ -2927,7 +2916,8 @@ msgid "protocol error while processing p #: netsync.cc:2557 #, 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:2589 #, c-format @@ -2946,7 +2936,8 @@ msgstr "" #: netsync.cc:2642 #, 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:2648 @@ -2961,7 +2952,8 @@ msgstr "" #: netsync.cc:2674 #, 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:2680 @@ -2992,7 +2984,9 @@ msgid "session limit %d reached, some co #: netsync.cc:2812 #, 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:2879 #, fuzzy, c-format @@ -3043,8 +3037,7 @@ msgstr "" "%s" msgstr "" -#: netsync.cc:3259 -#: netsync.cc:3263 +#: netsync.cc:3259 netsync.cc:3263 #, c-format msgid "network error: %s" msgstr "errore di rete: %s" @@ -3057,9 +3050,7 @@ msgstr "dimensione di blocco per l'outpu msgid "block size in bytes for \"automate stdio\" output" msgstr "dimensione di blocco per l'output di ‘automate stdio’ (in byte)" -#: options_list.hh:32 -#: options_list.hh:309 -#: options_list.hh:352 +#: options_list.hh:32 options_list.hh:317 options_list.hh:360 #, c-format msgid "cannot be zero or negative" msgstr "non può essere zero o negativo" @@ -3138,139 +3129,147 @@ msgstr "" msgstr "" #: options_list.hh:228 +msgid "don't perform the operation, just show what would have happened" +msgstr "" + +#: options_list.hh:236 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 +#: options_list.hh:245 msgid "leave out anything described by its argument" msgstr "" -#: options_list.hh:245 +#: options_list.hh:253 msgid "perform the associated file operation" msgstr "esegue l'operazione associata al file" -#: options_list.hh:253 +#: options_list.hh:261 msgid "print detailed version number, then exit" msgstr "stampa il numero di versione dettagliato ed esce" -#: options_list.hh:260 +#: options_list.hh:268 msgid "display help message" msgstr "mostra il messaggio di aiuto" -#: options_list.hh:269 +#: options_list.hh:277 msgid "include anything described by its argument" msgstr "" -#: options_list.hh:277 +#: options_list.hh:285 msgid "set key for signatures" msgstr "imposta chiave di firma" -#: options_list.hh:285 +#: options_list.hh:293 msgid "set location of key store" msgstr "imposta locazione del portachiavi" -#: options_list.hh:294 +#: options_list.hh:302 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: options_list.hh:304 +#: options_list.hh:312 msgid "limit log output to the last number of entries" msgstr "limita la stampa del log alle ultime N voci" -#: options_list.hh:313 +#: options_list.hh:321 msgid "file to write the log to" msgstr "file su cui scrivere il registro" -#: options_list.hh:324 +#: options_list.hh:332 msgid "set commit changelog message" msgstr "imposta il messaggio di ChangeLog del commit" -#: options_list.hh:331 +#: options_list.hh:339 msgid "set filename containing commit changelog message" msgstr "legge il messaggio di ChangeLog del commit da un file" -#: options_list.hh:339 +#: options_list.hh:347 msgid "perform the operations for files missing from workspace" msgstr "" -#: options_list.hh:347 +#: options_list.hh:355 msgid "limit log output to the next number of entries" msgstr "limita la stampa del log alle N voci seguenti" -#: options_list.hh:357 +#: options_list.hh:365 msgid "exclude files when printing logs" msgstr "esclude i file dalla stampa dei log" -#: options_list.hh:365 +#: options_list.hh:373 msgid "do not ignore any files" msgstr "non ignorare nessun file" -#: options_list.hh:373 +#: options_list.hh:381 msgid "exclude merges when printing logs" msgstr "esclude i merge dalla stampa dei log" -#: options_list.hh:381 +#: options_list.hh:389 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:389 +#: options_list.hh:397 msgid "do not load standard lua hooks" msgstr "non caricare gli hook standard Lua" -#: options_list.hh:397 +#: options_list.hh:405 msgid "record process id of server" msgstr "registra l'id del processo server" -#: options_list.hh:405 +#: options_list.hh:413 msgid "suppress verbose, informational and progress messages" msgstr "" -#: options_list.hh:415 +#: options_list.hh:423 msgid "load extra rc file" msgstr "carica un ulteriore file rc" -#: options_list.hh:423 +#: options_list.hh:431 msgid "suppress warning, verbose, informational and progress messages" msgstr "" -#: options_list.hh:433 +#: options_list.hh:441 msgid "also operate on the contents of any listed directories" msgstr "opera anche sui contenuti delle directory specificate" -#: options_list.hh:442 +#: options_list.hh:450 msgid "select revision id for operation" msgstr "seleziona la revisione per l'operazione" -#: options_list.hh:450 +#: options_list.hh:458 msgid "limit search for workspace to specified root" msgstr "limita la ricerca di uno spazio di lavoro alla radice specificata" -#: options_list.hh:458 +#: options_list.hh:466 msgid "use the current arguments as the future default" msgstr "usa gli argomenti attuali come default futuro" -#: options_list.hh:466 +#: options_list.hh:474 msgid "set ticker style (count|dot|none)" msgstr "imposta lo stile del ticker (count|dot|none)" -#: options_list.hh:477 +#: options_list.hh:485 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "" -#: options_list.hh:482 +#: options_list.hh:489 +msgid "revision(s) to stop logging at" +msgstr "" + +#: options_list.hh:497 msgid "perform the operations for unknown files from workspace" msgstr "" -#: options_list.hh:490 +#: options_list.hh:506 msgid "verbose completion output" msgstr "output dettagliato" -#: options_list.hh:498 +#: options_list.hh:514 msgid "print version number, then exit" msgstr "stampa il numero di versione ed esce" -#: options_list.hh:506 +#: options_list.hh:522 msgid "insert command line arguments taken from the given file" msgstr "" @@ -3289,10 +3288,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" @@ -3342,7 +3338,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 @@ -3392,6 +3389,28 @@ msgstr "etichette" msgid "tags" msgstr "etichette" +#: restrictions.cc:60 restrictions.cc:77 +#, c-format +msgid "conflicting include/exclude on path '%s'" +msgstr "" + +#: restrictions.cc:103 restrictions.cc:141 +#, c-format +msgid "restriction includes unknown path '%s'" +msgstr "" + +#: restrictions.cc:114 restrictions.cc:155 +#, c-format +msgid "restriction excludes unknown path '%s'" +msgstr "" + +#: restrictions.cc:118 restrictions.cc:159 +#, fuzzy, c-format +msgid "%d unknown path" +msgid_plural "%d unknown paths" +msgstr[0] "Percorso sconosciuto ‘%s’" +msgstr[1] "Percorso sconosciuto ‘%s’" + #: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" @@ -3421,12 +3440,16 @@ msgid "Directory for path %s cannot be a #: 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: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:1135 #, c-format @@ -3445,7 +3468,8 @@ msgid "converting existing revision grap #: 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:1590 #, c-format @@ -3531,7 +3555,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 @@ -3587,7 +3613,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 @@ -3646,7 +3674,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 @@ -3663,7 +3692,8 @@ msgid "failed to decode boolean testresu #: 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 @@ -3711,9 +3741,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" @@ -3755,7 +3783,8 @@ msgstr "aggiungo ‘%s’ al manifesto d #: 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:682 @@ -3763,14 +3792,12 @@ msgstr "sto cancellando ‘%s’" msgid "dropping %s" msgstr "sto cancellando ‘%s’" -#: work.cc:693 -#: work.cc:704 +#: work.cc:693 work.cc:704 #, c-format msgid "path %s already exists" msgstr "il percorso ‘%s’ esiste già" -#: work.cc:726 -#: work.cc:756 +#: work.cc:726 work.cc:756 #, c-format msgid "adding %s" msgstr "aggiungo ‘%s’" @@ -3927,7 +3954,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 @@ -3950,14 +3979,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 @@ -3978,5 +4009,8 @@ 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 "read from client failed with error code: %d" +#~ msgstr "lettura dal client fallita con codice di errore: %d" ============================================================ --- po/ja.po 9e1b79176947ef21a6eefc5f645440f8e2b9e94d +++ po/ja.po 6ce6f16773523b6b303d32c39a6a56a321444100 @@ -7,7 +7,7 @@ msgstr "" msgstr "" "Project-Id-Version: monotone HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-14 23:43+0100\n" +"POT-Creation-Date: 2006-12-15 00:27+0100\n" "PO-Revision-Date: 2006-08-24 13:11+0200\n" "Last-Translator: Satoru SATOH \n" "Language-Team: Japanese \n" @@ -45,13 +45,23 @@ msgstr "" msgid "[BRANCH]" msgstr "" -#: automate.cc:88 automate.cc:135 automate.cc:1206 +#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218 +#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529 +#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098 +#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297 +#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559 +#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656 +#, c-format +msgid "wrong argument count" +msgstr "" + +#: automate.cc:88 automate.cc:135 automate.cc:1183 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 +#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454 +#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705 #, fuzzy, c-format msgid "No such revision %s" msgstr "リビジョン '%s' は存在しません" @@ -74,99 +84,102 @@ msgstr "" msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "" -#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 +#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942 +#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332 +#: cmd_list.cc:564 +#, c-format +msgid "no arguments needed" +msgstr "" + +#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699 #, fuzzy msgid "REV" msgstr "REVID" -#: automate.cc:524 +#: automate.cc:526 msgid "SELECTOR" msgstr "" -#: automate.cc:893 automate.cc:1023 +#: automate.cc:895 automate.cc:1025 #, fuzzy msgid "[REVID]" msgstr "REVID" -#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 -#: automate.cc:1593 +#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566 +#: automate.cc:1571 #, 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 +#: automate.cc:1069 automate.cc:1095 cmd_merging.cc:845 msgid "REVID" msgstr "REVID" -#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163 #: 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 +#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535 +#: cmd_ws_commit.cc:1023 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "リビジョン '%s' は存在しません" -#: automate.cc:1156 +#: automate.cc:1122 cmd_files.cc:250 +msgid "FILEID" +msgstr "" + +#: automate.cc:1133 #, fuzzy, c-format msgid "no such file '%s'" msgstr "リビジョン '%s' は存在しません" -#: automate.cc:1172 +#: automate.cc:1149 msgid "OLD_FILE NEW_FILE" msgstr "" -#: automate.cc:1317 +#: automate.cc:1294 msgid "[BRANCH_PATTERN]" msgstr "" -#: automate.cc:1413 +#: automate.cc:1391 msgid "KEYID PASSPHRASE" msgstr "" -#: automate.cc:1431 cmd_key_cert.cc:42 +#: automate.cc:1409 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "鍵 '%s' は既に存在しています" -#: automate.cc:1434 cmd_key_cert.cc:45 +#: automate.cc:1412 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "鍵対 '%s' を生成しています" -#: automate.cc:1436 cmd_key_cert.cc:47 +#: automate.cc:1414 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "鍵対 '%s' を %s/ に保存しています" -#: automate.cc:1472 +#: automate.cc:1450 msgid "OPTION" msgstr "" -#: automate.cc:1495 +#: automate.cc:1473 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "" -#: automate.cc:1518 +#: automate.cc:1496 #, fuzzy msgid "REV FILE" msgstr "REV REV" -#: automate.cc:1535 automate.cc:1599 +#: automate.cc:1513 automate.cc:1577 #, fuzzy, c-format msgid "file %s is unknown for revision %s" msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" -#: automate.cc:1578 +#: automate.cc:1556 #, fuzzy msgid "REV1 FILE REV2" msgstr "REV REV" @@ -241,27 +254,36 @@ msgstr "リビジョン %s のブランã "multiple branch certs found for revision %s, please provide a branch name" msgstr "リビジョン %s のブランチ証明は複数あります. ブランチ名を指定して下さい" -#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 -#: cmd_automate.cc:340 +#: cmd_automate.cc:150 #, fuzzy, c-format -msgid "Bad input to automate stdio" +msgid "Bad input to automate stdio: expected ':' after string size" msgstr "parse_basic_io に対し不正な入力" -#: cmd_automate.cc:168 -#, c-format -msgid "read from client failed with error code: %d" -msgstr "" +#: cmd_automate.cc:169 +#, fuzzy, c-format +msgid "Bad input to automate stdio: unexpected EOF" +msgstr "parse_basic_io に対し不正な入力" -#: cmd_automate.cc:169 +#: cmd_automate.cc:197 #, fuzzy, c-format -msgid "Bad input to automate stdio (unexpected EOF)" +msgid "Bad input to automate stdio: unknown start token '%c'" msgstr "parse_basic_io に対し不正な入力" -#: cmd_automate.cc:365 +#: cmd_automate.cc:219 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected '%c' token" +msgstr "parse_basic_io に対し不正な入力" + +#: cmd_automate.cc:344 +#, fuzzy, c-format +msgid "Bad input to automate stdio: command name is missing" +msgstr "parse_basic_io に対し不正な入力" + +#: cmd_automate.cc:373 msgid "automation" msgstr "自動化" -#: cmd_automate.cc:366 +#: cmd_automate.cc:374 msgid "automation interface" msgstr "自動化インターフェース" @@ -343,7 +365,7 @@ msgstr "%s という変数はドメイムmsgstr "%s という変数はドメイン %s 内にはありません" #: 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 +#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429 #: commands.cc:275 msgid "informative" msgstr "情報" @@ -366,8 +388,8 @@ msgstr "" 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 +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 +#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735 msgid "[PATH]..." msgstr "[PATH]..." @@ -415,7 +437,7 @@ msgstr "" "降順で履歴を表示 ('FILE' でフィルタ)。一つ以上のリビジョンが指定されて\n" "いればそれを開始点として利用。" -#: cmd_diff_log.cc:616 +#: cmd_diff_log.cc:617 #, c-format msgid "only one of --last/--next allowed" msgstr "--last/--next のどちらかのみが許されています" @@ -507,19 +529,24 @@ msgstr "PATH または標準入力を識 msgid "calculate identity of PATH or stdin" msgstr "PATH または標準入力を識別" -#: cmd_files.cc:182 +#: cmd_files.cc:185 +#, fuzzy, c-format +msgid "no file version %s found in database" +msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" + +#: cmd_files.cc:210 cmd_files.cc:214 +#, fuzzy, c-format +msgid "no file '%s' found in revision '%s'" +msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" + +#: cmd_files.cc:221 cmd_files.cc:273 msgid "FILENAME" msgstr "FILENAME" -#: cmd_files.cc:183 +#: cmd_files.cc:222 msgid "write file from database to stdout" msgstr "データベースのファイルを標準出力に書き出し" -#: cmd_files.cc:212 cmd_files.cc:214 -#, fuzzy, c-format -msgid "no file '%s' found in revision '%s'" -msgstr "ファイル '%s' はリビジョン '%s' にはありませんでした\n" - #: cmd.hh:89 #, c-format msgid "non-hex digits in id" @@ -642,7 +669,7 @@ msgstr "UNtrusted" msgstr "UNtrusted" #: 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 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202 msgid "review" msgstr "レビュー" @@ -662,7 +689,7 @@ msgstr "ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®ãƒ†ã‚¹ãƒˆã®å® msgid "note the results of running a test on a revision" msgstr "リビジョンのテストの実行結果を記録" -#: cmd_key_cert.cc:223 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202 msgid "REVISION" msgstr "REVISION" @@ -693,7 +720,7 @@ msgstr "空のコメント" msgid "empty comment" msgstr "空のコメント" -#: cmd_list.cc:64 cmd_list.cc:676 +#: cmd_list.cc:64 cmd_list.cc:677 #, c-format msgid "no public key '%s' found in database" msgstr "データベース内に公開鍵 '%s' はありません" @@ -780,9 +807,10 @@ msgstr "" "データベースオブジェクト、現在のワークスペースのマニフェスト、\n" "既知または不明な、意図的に無視、または失なわれた状態のファイルを表示" -#: 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 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349 +#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635 +#: cmd_ws_commit.cc:735 msgid "workspace" msgstr "ワークスペース" @@ -900,8 +928,8 @@ msgstr "[統合済み] %s\n" msgstr "[統合済み] %s\n" #: 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 +#: cmd_merging.cc:821 cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 +#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119 msgid "tree" msgstr "ツリー" @@ -915,7 +943,7 @@ msgstr "--branch=BRANCH というようã msgstr "--branch=BRANCH というようにブランチを指定して下さい" #: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 -#: cmd_ws_commit.cc:463 +#: cmd_ws_commit.cc:519 #, c-format msgid "branch '%s' is empty" msgstr "ブランチ '%s' は空です" @@ -1130,85 +1158,77 @@ msgstr "指定の REVID について関é msgid "dump the roster associated with the given REVID" msgstr "指定の REVID について関連づけられた名簿をダンプ" -#: cmd_netsync.cc:43 +#: cmd_netsync.cc:33 #, fuzzy, c-format msgid "setting default server to %s" msgstr "デフォルトのサーバーを %s に設定\n" -#: cmd_netsync.cc:49 +#: cmd_netsync.cc:40 #, c-format -msgid "no hostname given" -msgstr "ホスト名を指定して下さい" - -#: cmd_netsync.cc:51 -#, c-format msgid "no server given and no default server set" msgstr "サーバが未指定であり、デフォルトのサーバーも設定されていません" -#: cmd_netsync.cc:79 cmd_netsync.cc:101 +#: cmd_netsync.cc:72 #, c-format msgid "no branch pattern given" msgstr "ブランチ名を指定して下さい" -#: cmd_netsync.cc:88 +#: cmd_netsync.cc:80 #, fuzzy, c-format msgid "setting default branch include pattern to '%s'" msgstr "ブランチ名に含めるデフォルトパターンを '%s' に設定\n" -#: cmd_netsync.cc:95 +#: cmd_netsync.cc:86 #, fuzzy, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "ブランチ名に含めないデフォルトパターンを '%s' に設定\n" -#: cmd_netsync.cc:103 +#: cmd_netsync.cc:93 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "ブランチパターンが未指定、かつデフォルトパターンも設定されていません" -#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184 msgid "network" msgstr "ネットワーク" -#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADDRESS[:PORTNUMBER] [PATTERN]]" -#: cmd_netsync.cc:120 +#: cmd_netsync.cc:110 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) にプッシュ" -#: cmd_netsync.cc:133 +#: cmd_netsync.cc:124 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) から取り込み" -#: cmd_netsync.cc:141 +#: cmd_netsync.cc:132 #, fuzzy, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "匿名で取り込んでいます; 認証が必要な場合は -kKEYNAME を使って下さい\n" -#: cmd_netsync.cc:148 +#: cmd_netsync.cc:139 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "PATTERN に合うブランチを netsync サーバー (ADDRESS) と同期" -#: cmd_netsync.cc:167 +#: cmd_netsync.cc:160 #, c-format msgid "pid file '%s' already exists" msgstr "PID ファイル '%s' は既に存在しています" -#: cmd_netsync.cc:169 +#: cmd_netsync.cc:162 #, fuzzy, c-format msgid "failed to create pid file '%s'" msgstr "オプションファイル '%s' の解析に失敗" -#: cmd_netsync.cc:191 -msgid "PATTERN ..." -msgstr "PATTERN..." - -#: cmd_netsync.cc:192 -msgid "serve the branches specified by PATTERNs to connecting clients" +#: cmd_netsync.cc:185 +#, fuzzy +msgid "serve the database to connecting clients" msgstr "PATTERNs で指定したブランチを接続クライアントに提供" -#: cmd_netsync.cc:208 +#: cmd_netsync.cc:201 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1216,7 +1236,7 @@ msgstr "" "パスフレーズをずっと保存しておきたいのなら権限が必要です。 (フック " "persist_phrase_ok() を参照)" -#: cmd_netsync.cc:214 +#: cmd_netsync.cc:207 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1297,7 +1317,11 @@ msgstr[1] "%d パケット読み込み" msgstr[0] "%d パケット読み込み" msgstr[1] "%d パケット読み込み" -#: cmd_ws_commit.cc:45 +#: cmd_ws_commit.cc:43 +msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" +msgstr "" + +#: cmd_ws_commit.cc:46 #, fuzzy msgid "" "Enter a description of this change.\n" @@ -1306,73 +1330,98 @@ msgstr "" "この変更の説明を入力して下さい\n" "'MTN:' で始まる行は自動的に削除されます\n" -#: cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:71 #, c-format msgid "edit of log message failed" msgstr "ログメッセージの編集に失敗しました" -#: cmd_ws_commit.cc:67 +#: cmd_ws_commit.cc:74 +#, fuzzy, c-format +msgid "failed to remove magic line; commit cancelled" +msgstr "空のログメッセージ; コミットは取り消されました" + +#: cmd_ws_commit.cc:80 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "ファイル、ディレクトリまたは完全なワークスペース (\".\") の変更を破棄" -#: cmd_ws_commit.cc:75 +#: cmd_ws_commit.cc:88 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "" -#: cmd_ws_commit.cc:95 +#: cmd_ws_commit.cc:108 #, fuzzy, c-format msgid "no missing files to revert" msgstr "みつからないファイル: %d\n" -#: cmd_ws_commit.cc:150 +#: cmd_ws_commit.cc:163 #, c-format msgid "reverting %s" msgstr "%s を戻しています" -#: cmd_ws_commit.cc:154 +#: cmd_ws_commit.cc:167 #, c-format msgid "no file version %s found in database for %s" msgstr "バージョン %s のファイルはデータベース内にみつかりません (対象: %s)" -#: cmd_ws_commit.cc:167 +#: cmd_ws_commit.cc:180 #, c-format msgid "recreating %s/" msgstr "%s/ を戻しています" -#: cmd_ws_commit.cc:190 +#: cmd_ws_commit.cc:203 msgid "disapprove of a particular revision" msgstr "特定のリビジョンを非承認" -#: cmd_ws_commit.cc:206 +#: cmd_ws_commit.cc:219 #, fuzzy, c-format msgid "revision %s has %d changesets, cannot invert" msgstr "リビジョン '%s' には %d 個の変更セットがあり、反転できません\n" -#: cmd_ws_commit.cc:210 +#: cmd_ws_commit.cc:223 #, c-format msgid "need --branch argument for disapproval" msgstr "非承認とするには --branch 引数が必要です" -#: cmd_ws_commit.cc:253 +#: cmd_ws_commit.cc:264 +#, fuzzy +msgid "[DIRECTORY...]" +msgstr "[DIRECTORY]" + +#: cmd_ws_commit.cc:265 +#, fuzzy +msgid "create one or more directories and add them to the workspace" +msgstr "ワークスペース内のエントリの名称を変更" + +#: cmd_ws_commit.cc:285 +#, fuzzy, c-format +msgid "directory '%s' already exists" +msgstr "取り出すディレクトリ '%s' は既に存在しています" + +#: cmd_ws_commit.cc:292 +#, c-format +msgid "ignoring directory '%s' [see .mtn-ignore]" +msgstr "" + +#: cmd_ws_commit.cc:309 msgid "add files to workspace" msgstr "ファイルをワークスペースに追加" -#: cmd_ws_commit.cc:260 +#: cmd_ws_commit.cc:316 #, c-format msgid "cannot set '--unknown' and '--recursive' at the same time" msgstr "" -#: cmd_ws_commit.cc:262 +#: cmd_ws_commit.cc:318 #, c-format msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" msgstr "" -#: cmd_ws_commit.cc:294 +#: cmd_ws_commit.cc:350 msgid "drop files from workspace" msgstr "ファイルをワークスペースから削除" -#: cmd_ws_commit.cc:330 +#: cmd_ws_commit.cc:386 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1380,15 +1429,15 @@ msgstr "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" -#: cmd_ws_commit.cc:332 +#: cmd_ws_commit.cc:388 msgid "rename entries in the workspace" msgstr "ワークスペース内のエントリの名称を変更" -#: cmd_ws_commit.cc:354 +#: cmd_ws_commit.cc:410 msgid "NEW_ROOT PUT_OLD" msgstr "NEW_ROOT PUT_OLD" -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:411 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1401,52 +1450,52 @@ msgstr "" "ディレクトリと、PUT_OLD という名前の現在のルートディレクトリを指定します。\n" "--execute の使用を強く推奨します。" -#: cmd_ws_commit.cc:373 +#: cmd_ws_commit.cc:429 msgid "show status of workspace" msgstr "ワークスペースの状態を表示" -#: cmd_ws_commit.cc:402 +#: cmd_ws_commit.cc:458 #, fuzzy, c-format msgid "Current branch: %s" msgstr "ブランチ '%s' についてコミット開始\n" -#: cmd_ws_commit.cc:408 +#: cmd_ws_commit.cc:464 #, c-format msgid "Changes against parent %s" msgstr "" -#: cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:469 #, fuzzy, c-format msgid " no changes" msgstr "変更なし" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:473 #, fuzzy, c-format msgid " dropped %s" msgstr "%s を破棄しています" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:478 #, fuzzy, c-format msgid "" " renamed %s\n" " to %s" msgstr "%s から %s に名称変更しています" -#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 +#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487 #, c-format msgid " added %s" msgstr "" -#: cmd_ws_commit.cc:435 +#: cmd_ws_commit.cc:491 #, c-format msgid " patched %s" msgstr "" -#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105 msgid "[DIRECTORY]" msgstr "[DIRECTORY]" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:496 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" @@ -1459,47 +1508,47 @@ msgstr "" "取り出します。ディレクトリが未指定ならディレクトリ名として\n" "ブランチ名を使います" -#: cmd_ws_commit.cc:458 +#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1048 #, c-format msgid "use --revision or --branch to specify what to checkout" msgstr "" -#: cmd_ws_commit.cc:466 +#: cmd_ws_commit.cc:522 cmd_ws_commit.cc:1054 #, c-format msgid "branch %s has multiple heads:" msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています:" -#: cmd_ws_commit.cc:469 +#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057 #, c-format msgid "choose one with '%s checkout -r'" msgstr "'%s update -r' で一つを選択して下さい" -#: cmd_ws_commit.cc:470 +#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058 #, c-format msgid "branch %s has multiple heads" msgstr "ブランチ %s には複数の最新版 (HEAD) が存在しています" -#: cmd_ws_commit.cc:497 +#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041 #, fuzzy, c-format msgid "revision %s is not a member of branch %s" msgstr "リビジョン %s はブランチ %s には属していません\n" -#: cmd_ws_commit.cc:514 +#: cmd_ws_commit.cc:570 #, c-format msgid "you must specify a destination directory" msgstr "" -#: cmd_ws_commit.cc:527 +#: cmd_ws_commit.cc:583 #, c-format msgid "checkout directory '%s' already exists" msgstr "取り出すディレクトリ '%s' は既に存在しています" -#: cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:617 #, c-format msgid "no file %s found in database for %s" msgstr "ファイル %s (対象 %s)はデータベース内にはみつかりません" -#: cmd_ws_commit.cc:579 +#: cmd_ws_commit.cc:635 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1509,45 +1558,45 @@ msgstr "" "get PATH [ATTR]\n" "drop PATH [ATTR]" -#: cmd_ws_commit.cc:580 +#: cmd_ws_commit.cc:636 msgid "set, get or drop file attributes" msgstr "ファイル属性を設定/取得/削除" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:653 #, c-format msgid "Unknown path '%s'" msgstr "不明なパス '%s'" -#: cmd_ws_commit.cc:626 +#: cmd_ws_commit.cc:682 #, fuzzy, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "パス '%s' には属性 '%s' がありません\n" -#: cmd_ws_commit.cc:656 +#: cmd_ws_commit.cc:712 #, c-format msgid "No attributes for '%s'" msgstr "'%s' について属性はありません" -#: cmd_ws_commit.cc:667 +#: cmd_ws_commit.cc:723 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "パス '%s' について '%s' という属性はありません" -#: cmd_ws_commit.cc:680 +#: cmd_ws_commit.cc:736 msgid "commit workspace to database" msgstr "ワークスペースをデータベースにコミット" -#: cmd_ws_commit.cc:711 +#: cmd_ws_commit.cc:767 #, fuzzy, c-format msgid "no changes to commit" msgstr "コミットする変更がありません\n" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:787 #, fuzzy, c-format msgid "beginning commit on branch '%s'" msgstr "ブランチ '%s' についてコミット開始\n" -#: cmd_ws_commit.cc:740 +#: cmd_ws_commit.cc:796 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1558,37 +1607,37 @@ msgstr "" "_MTN/log を移動/削除するか、コマンド行から --message/--message-file を\n" "消して下さい。" -#: cmd_ws_commit.cc:755 +#: cmd_ws_commit.cc:811 #, c-format msgid "empty log message; commit canceled" msgstr "空のログメッセージ; コミットは取り消されました" -#: cmd_ws_commit.cc:777 +#: cmd_ws_commit.cc:833 #, fuzzy, c-format msgid "log message rejected by hook: %s" msgstr "ログメッセージを拒否: %s\n" -#: cmd_ws_commit.cc:785 +#: cmd_ws_commit.cc:841 #, fuzzy, c-format msgid "revision %s already in database" msgstr "リビジョン %s は既にデータベース内に存在しています\n" -#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 +#: cmd_ws_commit.cc:880 cmd_ws_commit.cc:910 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "ファイル '%s' は commit 前に変更されました. 中止します" -#: cmd_ws_commit.cc:836 +#: cmd_ws_commit.cc:892 #, fuzzy, c-format msgid "Your database is missing version %s of file '%s'" msgstr "ファイル %s 内のデータベースバージョンを検出できませんでした" -#: cmd_ws_commit.cc:886 +#: cmd_ws_commit.cc:942 #, fuzzy, c-format msgid "committed revision %s" msgstr "リビジョン %s をコミット\n" -#: cmd_ws_commit.cc:892 +#: cmd_ws_commit.cc:948 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1597,22 +1646,48 @@ msgstr "" "注意: このリビジョンによって分岐が生じます\n" "注意: 分岐を望まないなら '%s merge' を実行して下さい" -#: cmd_ws_commit.cc:926 +#: cmd_ws_commit.cc:982 msgid "setup a new workspace directory, default to current" msgstr "新しいワークスペースディレクトリを作成 (デフォルト: 現在の場所)" -#: cmd_ws_commit.cc:932 +#: cmd_ws_commit.cc:988 #, c-format msgid "need --branch argument for setup" msgstr "作成には --branch 引数が必要です" -#: cmd_ws_commit.cc:949 +#: cmd_ws_commit.cc:1004 +#, fuzzy +msgid "DIRECTORY" +msgstr "[DIRECTORY]" + +#: cmd_ws_commit.cc:1005 +msgid "import the contents of the given directory tree into a given branch" +msgstr "" + +#: cmd_ws_commit.cc:1016 +#, c-format +msgid "you must specify a directory to import" +msgstr "" + +#: cmd_ws_commit.cc:1067 +#, fuzzy, c-format +msgid "import directory '%s' doesn't exists" +msgstr "ディレクトリ '%s' は存在しません" + +#: cmd_ws_commit.cc:1068 +#, fuzzy, c-format +msgid "import directory '%s' is a file" +msgstr "" +"ディレクトリ '%s' を作成できませんでした\n" +"ファイルです" + +#: cmd_ws_commit.cc:1106 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" msgstr "" -#: cmd_ws_commit.cc:962 +#: cmd_ws_commit.cc:1119 msgid "refresh the inodeprint cache" msgstr "i-node 表示キャッシュを更新" @@ -1693,7 +1768,7 @@ msgstr "印" msgid "markings" msgstr "印" -#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244 msgid "revisions" msgstr "リビジョン" @@ -1701,7 +1776,7 @@ msgstr "祖先" msgid "ancestry" msgstr "祖先" -#: database_check.cc:434 netsync.cc:2973 +#: database_check.cc:434 netsync.cc:3067 msgid "keys" msgstr "鍵" @@ -2148,27 +2223,27 @@ msgstr "クエリで %d 行要求しまã msgid "wanted %d rows got %d in query: %s" msgstr "クエリで %d 行要求しましたが得たのは %s です: %s\n" -#: database.cc:2040 +#: database.cc:2043 #, c-format msgid "another key with name '%s' already exists" msgstr "'%s' という名前の他の鍵が既に存在しています" -#: database.cc:3037 +#: database.cc:3041 #, c-format msgid "no database specified" msgstr "データベース未指定" -#: database.cc:3045 +#: database.cc:3049 #, c-format msgid "database %s does not exist" msgstr "データベース %s は存在しません" -#: database.cc:3046 +#: database.cc:3050 #, c-format msgid "%s is a directory, not a database" msgstr "%s はデータベースではなくディレクトリです" -#: database.cc:3071 +#: database.cc:3075 #, c-format msgid "could not open database '%s': %s" msgstr "データベース '%s': %s を開けませんでした" @@ -2204,7 +2279,7 @@ msgstr "" "[ 右] %s\n" "[統合済] %s\n" -#: file_io.cc:176 file_io.cc:183 +#: file_io.cc:194 file_io.cc:201 #, c-format msgid "" "could not create directory '%s'\n" @@ -2213,7 +2288,7 @@ msgstr "" "ディレクトリ '%s' を作成できませんでした\n" "ファイルです" -#: file_io.cc:178 +#: file_io.cc:196 #, c-format msgid "" "could not create directory '%s'\n" @@ -2222,17 +2297,17 @@ msgstr "" "ディレクトリ '%s' を作成できませんでした\n" "%s" -#: file_io.cc:182 +#: file_io.cc:200 #, c-format msgid "could not create directory '%s'" msgstr "ディレクトリ '%s' を作成できませんでした" -#: file_io.cc:195 +#: file_io.cc:213 #, c-format msgid "failed to create directory '%s' for '%s'" msgstr "ディレクトリ '%s' ('%s' のための)の作成に失敗しました" -#: file_io.cc:209 +#: file_io.cc:227 #, c-format msgid "" "could not remove '%s'\n" @@ -2241,107 +2316,107 @@ msgstr "" "'%s' を削除できませんでした\n" "%s" -#: file_io.cc:219 +#: file_io.cc:237 #, c-format msgid "file to delete '%s' does not exist" msgstr "削除するファイル '%s' は存在しません" -#: file_io.cc:220 +#: file_io.cc:238 #, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "削除するファイル '%s' はファイルでなく、ディレクトリです" -#: file_io.cc:228 +#: file_io.cc:246 #, c-format msgid "directory to delete '%s' does not exist" msgstr "削除するディレクトリ '%s' は存在しません" -#: file_io.cc:229 +#: file_io.cc:247 #, c-format msgid "directory to delete, '%s', is not a directory but a file" msgstr "削除するディレクトリ '%s' はディレクトリではなくファイルです" -#: file_io.cc:236 +#: file_io.cc:254 #, c-format msgid "object to delete, '%s', does not exist" msgstr "削除するオブジェクト '%s' は存在しません" -#: file_io.cc:244 +#: file_io.cc:262 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "削除するディレクトリ '%s' は存在しません" -#: file_io.cc:245 +#: file_io.cc:263 #, c-format msgid "directory to delete, '%s', is a file" msgstr "削除するディレクトリ '%s' はファイルです" -#: file_io.cc:254 +#: file_io.cc:272 #, c-format msgid "rename source file '%s' does not exist" msgstr "名称変更する元のファイル '%s' は存在しません" -#: file_io.cc:255 +#: file_io.cc:273 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" msgstr "名称変更元のファイル '%s' はディレクトリです -- monotone のバグ?" -#: file_io.cc:258 file_io.cc:271 +#: file_io.cc:276 file_io.cc:289 #, c-format msgid "rename target '%s' already exists" msgstr "名称変更ターゲット '%s' は既に存在しています" -#: file_io.cc:267 +#: file_io.cc:285 #, c-format msgid "rename source dir '%s' does not exist" msgstr "名称変更元のディレクトリ '%s' は存在しません" -#: file_io.cc:268 +#: file_io.cc:286 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" msgstr "名称変更元のディレクトリ '%s' はファイルです -- monotone のバグ?" -#: file_io.cc:282 +#: file_io.cc:300 #, c-format msgid "rename source path '%s' does not exist" msgstr "名称変更元のパス '%s' は存在しません" -#: file_io.cc:297 +#: file_io.cc:315 #, c-format msgid "file %s does not exist" msgstr "ファイル %s は存在しません" -#: file_io.cc:298 +#: file_io.cc:316 #, c-format msgid "file %s cannot be read as data; it is a directory" msgstr "'%s' は期待していたファイルではなく、ディレクトリです" -#: file_io.cc:302 +#: file_io.cc:320 #, c-format msgid "cannot open file %s for reading" msgstr "ファイル %s を読み込みのために開くことができません" -#: file_io.cc:341 +#: file_io.cc:359 #, c-format msgid "Cannot read standard input multiple times" msgstr "標準入力を何度も読み込むことはできません" -#: file_io.cc:372 +#: file_io.cc:390 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "'%s' にデータを上書きできません。ディレクトリです" -#: file_io.cc:380 +#: file_io.cc:398 #, c-format msgid "cannot open file %s for writing" msgstr "ファイル %s を書き込みのために開くことができません" -#: file_io.cc:437 +#: file_io.cc:455 #, fuzzy, c-format msgid "caught runtime error %s constructing file path for %s" msgstr "%s についてファイルパス作成中に実行時エラー %s 発生\n" -#: file_io.cc:530 work.cc:1079 +#: file_io.cc:548 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "そのようなファイルまたはディレクトリはありません: '%s'" @@ -2386,22 +2461,22 @@ msgstr "'%s' に対するパスフレー msgid "passphrase for '%s' is incorrect" msgstr "'%s' に対するパスフレーズが間違っています" -#: lua.cc:462 lua.cc:476 +#: lua.cc:463 lua.cc:477 lua.cc:512 #, c-format msgid "%s called with an invalid parameter" msgstr "%s 呼出し時の引数が不適切です" -#: lua.cc:479 +#: lua.cc:480 lua.cc:515 #, fuzzy, c-format msgid "Directory '%s' does not exist" msgstr "ディレクトリ '%s' は存在しません" -#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 +#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "'%s' はディレクトリではありません" -#: lua.cc:499 +#: lua.cc:500 lua.cc:538 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "初期化ファイル '%s' を読み込み中に lua のエラー" @@ -2537,41 +2612,41 @@ msgstr "'%s' の検証に失敗" msgid "check of '%s' failed" msgstr "'%s' の検証に失敗" -#: netsync.cc:724 +#: netsync.cc:760 msgid "bytes in" msgstr "バイト (入)" -#: netsync.cc:726 +#: netsync.cc:762 msgid "bytes out" msgstr "バイト (出)" -#: netsync.cc:730 +#: netsync.cc:766 msgid "certs in" msgstr "証明 (入)" -#: netsync.cc:732 netsync.cc:745 +#: netsync.cc:768 netsync.cc:781 msgid "revs in" msgstr "リビジョン (入)" -#: netsync.cc:737 +#: netsync.cc:773 msgid "certs out" msgstr "証明 (出)" -#: netsync.cc:739 netsync.cc:747 +#: netsync.cc:775 netsync.cc:783 msgid "revs out" msgstr "リビジョン (出)" -#: netsync.cc:853 +#: netsync.cc:889 #, c-format msgid "underflow on count of %s items to receive" msgstr "受け取る %s アイテムについて個数がアンダーフロー" -#: netsync.cc:1201 +#: netsync.cc:1261 netsync.cc:1269 #, c-format msgid "received network error: %s" msgstr "ネットワークエラーを受信: %s" -#: netsync.cc:1236 +#: netsync.cc:1304 #, fuzzy, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2592,12 +2667,12 @@ msgstr "" "期待値 %s\n" "'%s unset %s %s' とすると検証結果を無視するようになります\n" -#: netsync.cc:1246 +#: netsync.cc:1314 #, c-format msgid "server key changed" msgstr "サーバー鍵が変更されました" -#: netsync.cc:1251 +#: netsync.cc:1319 #, fuzzy, c-format msgid "" "first time connecting to server %s\n" @@ -2608,53 +2683,48 @@ msgstr "" "偽物でないとは思いますが、鍵の指紋を二重にチェックしてみるといいでしょう: %" "s\n" -#: netsync.cc:1258 +#: netsync.cc:1326 #, fuzzy, c-format msgid "saving public key for %s to database" msgstr "%s の公開鍵をデータベースに保存中\n" -#: netsync.cc:1352 +#: netsync.cc:1429 #, fuzzy, c-format msgid "rejected attempt at anonymous connection for write" msgstr "匿名での接続からの書き込みを拒否\n" -#: netsync.cc:1358 +#: netsync.cc:1436 #, fuzzy, c-format msgid "rejected attempt at anonymous connection while running as sink" msgstr "シンクとして実行中の匿名での接続からの書き込みを拒否\n" -#: netsync.cc:1372 netsync.cc:1496 +#: netsync.cc:1452 #, c-format -msgid "not serving branch '%s'" -msgstr "ブランチ '%s' は提供していません" - -#: netsync.cc:1377 -#, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "ブランチ '%s' への匿名アクセスはサーバーによって拒否されました" -#: netsync.cc:1385 +#: netsync.cc:1460 #, fuzzy, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'" msgstr "匿名での '%s' ('%s' を除く)の読み込みを許可しました\n" -#: netsync.cc:1391 +#: netsync.cc:1466 #, fuzzy, c-format msgid "allowed anonymous read/write permission for '%s' excluding '%s'" msgstr "匿名での '%s' ('%s' を除く)の読み込みを許可しました\n" -#: netsync.cc:1447 +#: netsync.cc:1531 #, fuzzy, c-format +msgid "remote public key hash '%s' is unknown" +msgstr "リモートの公開鍵ハッシュ '%s' は不明なものです\n" + +#: netsync.cc:1549 +#, fuzzy, c-format msgid "detected replay attack in auth netcmd" msgstr "auth netcmd 中に繰り返し攻撃を検出\n" -#: netsync.cc:1468 +#: netsync.cc:1571 #, fuzzy, c-format -msgid "remote public key hash '%s' is unknown" -msgstr "リモートの公開鍵ハッシュ '%s' は不明なものです\n" - -#: netsync.cc:1484 -#, fuzzy, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " "sink" @@ -2662,19 +2732,19 @@ msgstr "" "純粋シンクとして実行中の '%s' の '%s' ('%s' を除く) の読み込みを拒否しまし" "た\n" -#: netsync.cc:1501 +#: netsync.cc:1584 #, fuzzy, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" msgstr "" "'%s' の '%s' ('%s' を除く)の読み込みをブランチ '%s' のために拒否しました\n" -#: netsync.cc:1511 +#: netsync.cc:1594 #, fuzzy, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'" msgstr "'%s' の匿名での '%s' ('%s' を除く)の読み込みを許可しました\n" -#: netsync.cc:1521 +#: netsync.cc:1605 #, fuzzy, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -2683,141 +2753,141 @@ msgstr "" "純粋ソースとして実行中の '%s' の '%s' ('%s' を除く) への書き込みを拒否しまし" "た\n" -#: netsync.cc:1528 +#: netsync.cc:1613 #, fuzzy, c-format msgid "denied '%s' write permission for '%s' excluding '%s'" msgstr "'%s' の '%s' ('%s' を除く)への書き込みを拒否しました\n" -#: netsync.cc:1532 +#: netsync.cc:1617 #, fuzzy, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'" msgstr "'%s' の '%s' ('%s' を除く)への書き込みを許可しました\n" -#: netsync.cc:1556 +#: netsync.cc:1641 #, fuzzy, c-format msgid "bad client signature" msgstr "不正なクライアント署名\n" -#: netsync.cc:1572 +#: netsync.cc:1657 #, fuzzy, c-format msgid "Unexpected 'refine' command on non-refined item type" msgstr "refine されていないアイテム型について予期しない 'refine' コマンド\n" -#: netsync.cc:1669 +#: netsync.cc:1754 #, c-format msgid "unknown bye phase %d received" msgstr "不明な bye フェーズ %d を受信" -#: netsync.cc:1684 +#: netsync.cc:1769 #, fuzzy, c-format msgid "Unexpected 'done' command on non-refined item type" msgstr "refine されていないアイテム型について予期しない 'done' コマンド\n" -#: netsync.cc:1756 +#: netsync.cc:1841 #, fuzzy, c-format msgid "%s with hash '%s' does not exist in our database" msgstr "こちらのデータベースにはハッシュ '%s' の epoch は含まれていません" -#: netsync.cc:1859 +#: netsync.cc:1945 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" "ブランチ %s について epoch が一致しません。サーバー側 '%s', クライアント側 '%" "s'" -#: netsync.cc:1877 +#: netsync.cc:1963 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "公開鍵 '%s' (%s) についてハッシュ検証に失敗。期待値 '%s'、計算値 '%s'" -#: netsync.cc:1891 +#: netsync.cc:1977 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "リビジョン証明 '%s' についてハッシュ検証に失敗" -#: netsync.cc:1953 +#: netsync.cc:2039 #, c-format msgid "Received warning from usher: %s" msgstr "門番から警告を受信: %s" -#: netsync.cc:2040 netsync.cc:2071 +#: netsync.cc:2126 netsync.cc:2157 msgid "source and sink" msgstr "ソースとシンク" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "source" msgstr "ソース" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "sink" msgstr "シンク" -#: netsync.cc:2228 +#: netsync.cc:2314 #, fuzzy, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch" msgstr "netcmd dispatch の後でピーア %s の入力バッファがあふれました\n" -#: netsync.cc:2240 netsync.cc:2339 +#: netsync.cc:2326 netsync.cc:2425 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生\n" -#: netsync.cc:2246 +#: netsync.cc:2332 #, fuzzy, c-format msgid "error: %s" msgstr "エラー: %s\n" -#: netsync.cc:2310 +#: netsync.cc:2396 #, fuzzy, c-format msgid "connecting to %s" msgstr "%s に接続中\n" -#: netsync.cc:2354 +#: netsync.cc:2440 #, fuzzy, c-format msgid "timed out waiting for I/O with peer %s, disconnecting" msgstr "ピーア %s の I/O を待っている間にタイムアウト, 切断中\n" -#: netsync.cc:2377 +#: netsync.cc:2463 #, fuzzy, c-format msgid "processing failure while talking to peer %s, disconnecting" msgstr "ピーア %s と通信中に処理が失敗し、切断中\n" -#: netsync.cc:2394 +#: netsync.cc:2480 #, fuzzy, c-format msgid "successful exchange with %s" msgstr "%s との交換に成功\n" -#: netsync.cc:2400 +#: netsync.cc:2486 #, fuzzy, c-format msgid "peer %s disconnected after we informed them of error" msgstr "ピーア %s にエラーを報告後に切断されました\n" -#: netsync.cc:2405 +#: netsync.cc:2491 #, fuzzy, c-format msgid "I/O failure while talking to peer %s, disconnecting" msgstr "ピーア %s と通信中に I/O の失敗、切断中\n" -#: netsync.cc:2471 +#: netsync.cc:2557 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s', marking as bad" msgstr "ピーア %s: '%s' を処理中にプロトコルエラー発生、誤りとして印付け\n" -#: netsync.cc:2503 +#: netsync.cc:2589 #, fuzzy, c-format msgid "accepted new client connection from %s : %s" msgstr "%s : %s からの新しいクライアント接続を受理\n" -#: netsync.cc:2540 +#: netsync.cc:2626 #, fuzzy, c-format msgid "protocol error while processing peer %s: '%s', disconnecting" msgstr "ピーア %s: '%s' からを処理中にプロトコルエラー発生、切断中\n" -#: netsync.cc:2551 +#: netsync.cc:2637 #, fuzzy, c-format msgid "peer %s read failed in working state (error)" msgstr "ピーア %s についてワーキングステートで読み込みに失敗 (エラー)\n" -#: netsync.cc:2556 +#: netsync.cc:2642 #, fuzzy, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)" @@ -2825,17 +2895,17 @@ msgstr "" "ピーア %s についてシャットダウンステートで読み込みに失敗 (おそらくクライアン" "トの誤ったエラー報告です)\n" -#: netsync.cc:2562 +#: netsync.cc:2648 #, fuzzy, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "ピーア %s について確認ステートで読み込みに失敗 (成功)\n" -#: netsync.cc:2583 +#: netsync.cc:2669 #, fuzzy, c-format msgid "peer %s write failed in working state (error)" msgstr "ピーア %s についてワーキングステートで書き込みに失敗 (エラー)\n" -#: netsync.cc:2588 +#: netsync.cc:2674 #, fuzzy, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)" @@ -2843,65 +2913,70 @@ msgstr "" "ピーア %s についてシャットダウンステートで書き込みに失敗 (おそらくクライアン" "トの誤ったエラー報告です)\n" -#: netsync.cc:2594 +#: netsync.cc:2680 #, fuzzy, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "ピーア %s について確認ステートで書き込みに失敗 (成功)\n" -#: netsync.cc:2621 +#: netsync.cc:2707 #, fuzzy, c-format msgid "peer %s processing finished, disconnecting" msgstr "ピーア %s 処理終了、切断中\n" -#: netsync.cc:2643 +#: netsync.cc:2729 #, fuzzy, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting" msgstr "fd %d (ピーア %s) はアイドル時間が長すぎます。切断中\n" -#: netsync.cc:2711 +#: netsync.cc:2797 #, fuzzy, c-format msgid "beginning service on %s : %s" msgstr "%s : %s でサービスを開始\n" -#: netsync.cc:2712 +#: netsync.cc:2798 msgid "" msgstr "<すべてのインターフェース>" -#: netsync.cc:2726 +#: netsync.cc:2812 #, fuzzy, c-format msgid "session limit %d reached, some connections will be refused" msgstr "セッション制限 %d に達しました。いくつかの接続は拒否されます\n" -#: netsync.cc:2791 +#: netsync.cc:2879 #, fuzzy, c-format +msgid "Network error on peer %s, disconnecting" +msgstr "ピーア %s から OOB データを受信、切断中\n" + +#: netsync.cc:2885 +#, fuzzy, c-format msgid "got OOB from peer %s, disconnecting" msgstr "ピーア %s から OOB データを受信、切断中\n" -#: netsync.cc:2851 +#: netsync.cc:2945 #, fuzzy, c-format msgid "beginning service on %s" msgstr "%s : %s でサービスを開始\n" -#: netsync.cc:2914 +#: netsync.cc:3008 #, fuzzy, c-format msgid "got some OOB data on fd %d (peer %s), disconnecting" msgstr "ピーア %s から OOB データを受信し、切断中\n" -#: netsync.cc:2963 +#: netsync.cc:3057 #, fuzzy, c-format msgid "finding items to synchronize:" msgstr "同期アイテムを検索中:\n" -#: netsync.cc:2971 +#: netsync.cc:3065 msgid "certificates" msgstr "証明書" -#: netsync.cc:3084 +#: netsync.cc:3178 #, c-format msgid "Cannot find key '%s'" msgstr "鍵 '%s' をみつけることができません" -#: netsync.cc:3124 +#: netsync.cc:3218 #, fuzzy, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -2910,7 +2985,7 @@ msgstr "" "引用符を含むブランチパターンを含める:\n" "%s\n" -#: netsync.cc:3130 +#: netsync.cc:3224 #, fuzzy, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -2919,7 +2994,7 @@ msgstr "" "引用符を含むブランチパターンを含めない:\n" "%s\n" -#: netsync.cc:3165 netsync.cc:3169 +#: netsync.cc:3259 netsync.cc:3263 #, c-format msgid "network error: %s" msgstr "ネットワークエラー: %s" @@ -2932,7 +3007,7 @@ msgstr "" msgid "block size in bytes for \"automate stdio\" output" msgstr "" -#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#: options_list.hh:32 options_list.hh:317 options_list.hh:360 #, c-format msgid "cannot be zero or negative" msgstr "" @@ -3011,143 +3086,151 @@ msgstr "名簿作成中に指定の鍵だmsgstr "名簿作成中に指定の鍵のエントリの属性を破棄" #: options_list.hh:228 +msgid "don't perform the operation, just show what would have happened" +msgstr "" + +#: options_list.hh:236 msgid "file to dump debugging log to, on failure" msgstr "失敗時にデバッグログを出力するファイル" -#: options_list.hh:237 +#: options_list.hh:245 msgid "leave out anything described by its argument" msgstr "引数によって説明されるすべてを省く" -#: options_list.hh:245 +#: options_list.hh:253 msgid "perform the associated file operation" msgstr "関連付けられたファイル操作を実行" -#: options_list.hh:253 +#: options_list.hh:261 msgid "print detailed version number, then exit" msgstr "詳細なバージョン番号を表示し、終了" -#: options_list.hh:260 +#: options_list.hh:268 msgid "display help message" msgstr "ヘルプメッセージを表示" -#: options_list.hh:269 +#: options_list.hh:277 #, fuzzy msgid "include anything described by its argument" msgstr "引数によって説明されるすべてを省く" -#: options_list.hh:277 +#: options_list.hh:285 msgid "set key for signatures" msgstr "署名の鍵を設定" -#: options_list.hh:285 +#: options_list.hh:293 msgid "set location of key store" msgstr "鍵の保存場所を設定" -#: options_list.hh:294 +#: options_list.hh:302 msgid "push the specified key even if it hasn't signed anything" msgstr "指定の鍵について署名の有無にかかわらず取り込み" -#: options_list.hh:304 +#: options_list.hh:312 msgid "limit log output to the last number of entries" msgstr "ログ出力のエントリ数(最近)を制限" -#: options_list.hh:313 +#: options_list.hh:321 msgid "file to write the log to" msgstr "ログを書き込むファイル" -#: options_list.hh:324 +#: options_list.hh:332 msgid "set commit changelog message" msgstr "コミット変更記録メッセージを設定" -#: options_list.hh:331 +#: options_list.hh:339 msgid "set filename containing commit changelog message" msgstr "コミット変更記録メッセージを含むファイルを設定" -#: options_list.hh:339 +#: options_list.hh:347 msgid "perform the operations for files missing from workspace" msgstr "ワークスペース内ではみつからないファイルについて操作を実行" -#: options_list.hh:347 +#: options_list.hh:355 msgid "limit log output to the next number of entries" msgstr "ログ出力のエントリ数(次)を制限" -#: options_list.hh:357 +#: options_list.hh:365 msgid "exclude files when printing logs" msgstr "ログを表示する際にファイルについては省略" -#: options_list.hh:365 +#: options_list.hh:373 msgid "do not ignore any files" msgstr "" -#: options_list.hh:373 +#: options_list.hh:381 msgid "exclude merges when printing logs" msgstr "ログを表示する際に統合については省略" -#: options_list.hh:381 +#: options_list.hh:389 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" msgstr "" "~/.monotone/monotonerc または _MTN/monotonerc lua ファイルを読み込まない" -#: options_list.hh:389 +#: options_list.hh:397 msgid "do not load standard lua hooks" msgstr "標準 lua フックを読み込まない" -#: options_list.hh:397 +#: options_list.hh:405 msgid "record process id of server" msgstr "サーバーのプロセス ID を記録" -#: options_list.hh:405 +#: options_list.hh:413 #, fuzzy msgid "suppress verbose, informational and progress messages" msgstr "ログおよび進捗を示すメッセージを表示しない" -#: options_list.hh:415 +#: options_list.hh:423 msgid "load extra rc file" msgstr "別の初期化ファイルを読み込む" -#: options_list.hh:423 +#: options_list.hh:431 #, fuzzy msgid "suppress warning, verbose, informational and progress messages" msgstr "ログおよび進捗を示すメッセージを表示しない" -#: options_list.hh:433 +#: options_list.hh:441 msgid "also operate on the contents of any listed directories" msgstr "一覧のディレクトリの内容についても処理" -#: options_list.hh:442 +#: options_list.hh:450 msgid "select revision id for operation" msgstr "操作のためのリビジョン ID を選択" -#: options_list.hh:450 +#: options_list.hh:458 msgid "limit search for workspace to specified root" msgstr "ワークスペースの検索を指定のルート下に制限" -#: options_list.hh:458 +#: options_list.hh:466 msgid "use the current arguments as the future default" msgstr "現在の引数を将来のデフォルトとして使用" -#: options_list.hh:466 +#: options_list.hh:474 msgid "set ticker style (count|dot|none)" msgstr "ティッカーのスタイルを設定 (count|dot|none)" -#: options_list.hh:477 +#: options_list.hh:485 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "" -#: options_list.hh:482 +#: options_list.hh:489 +msgid "revision(s) to stop logging at" +msgstr "" + +#: options_list.hh:497 msgid "perform the operations for unknown files from workspace" msgstr "ワークスペース内では不明なファイルについて操作を実行" -#: options_list.hh:490 +#: options_list.hh:506 msgid "verbose completion output" msgstr "冗長な完了メッセージ" -#: options_list.hh:498 +#: options_list.hh:514 msgid "print version number, then exit" msgstr "バージョン番号を表示し、終了" -#: options_list.hh:506 +#: options_list.hh:522 msgid "insert command line arguments taken from the given file" msgstr "指定のファイルの内容をコマンド行引数に挿入" @@ -3264,6 +3347,28 @@ msgstr "タグ" msgid "tags" msgstr "タグ" +#: restrictions.cc:60 restrictions.cc:77 +#, c-format +msgid "conflicting include/exclude on path '%s'" +msgstr "" + +#: restrictions.cc:103 restrictions.cc:141 +#, fuzzy, c-format +msgid "restriction includes unknown path '%s'" +msgstr "不明なパス '%s'\n" + +#: restrictions.cc:114 restrictions.cc:155 +#, fuzzy, c-format +msgid "restriction excludes unknown path '%s'" +msgstr "不明なパス '%s'\n" + +#: restrictions.cc:118 restrictions.cc:159 +#, fuzzy, c-format +msgid "%d unknown path" +msgid_plural "%d unknown paths" +msgstr[0] "不明なパス '%s'\n" +msgstr[1] "不明なパス '%s'\n" + #: revision.cc:841 #, fuzzy, c-format msgid "scanning for bogus merge edges" @@ -3840,6 +3945,15 @@ msgstr "" msgid "this workspace is in the current format, no migration is necessary." msgstr "" +#~ msgid "no hostname given" +#~ msgstr "ホスト名を指定して下さい" + +#~ msgid "PATTERN ..." +#~ msgstr "PATTERN..." + +#~ msgid "not serving branch '%s'" +#~ msgstr "ブランチ '%s' は提供していません" + #~ msgid "failed to parse date string '%s': %s" #~ msgstr "データ文字列 '%s' の解析に失敗: %s" @@ -3918,9 +4032,6 @@ msgstr "" #~ msgid "updating %s" #~ msgstr "%s を更新しています" -#~ msgid "unknown path '%s'\n" -#~ msgstr "不明なパス '%s'\n" - #~ msgid "negative or zero last not allowed\n" #~ msgstr "最終値を負または零にすることはできません\n" ============================================================ --- po/pt_BR.po ccff69e42d620c1b0ca5e40023ab6b8b8f112324 +++ po/pt_BR.po 8d7d9283bbdb00e6a75564be748bc29844275fa8 @@ -7,7 +7,7 @@ msgstr "" msgstr "" "Project-Id-Version: Monotone 0.30\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-14 23:43+0100\n" +"POT-Creation-Date: 2006-12-15 00:27+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" @@ -45,13 +45,23 @@ msgstr "[RAMO]" msgid "[BRANCH]" msgstr "[RAMO]" -#: automate.cc:88 automate.cc:135 automate.cc:1206 +#: automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218 +#: automate.cc:359 automate.cc:426 automate.cc:451 automate.cc:529 +#: automate.cc:898 automate.cc:1028 automate.cc:1072 automate.cc:1098 +#: automate.cc:1125 automate.cc:1152 automate.cc:1186 automate.cc:1297 +#: automate.cc:1394 automate.cc:1453 automate.cc:1499 automate.cc:1559 +#: cmd_files.cc:253 cmd_files.cc:276 cmd_list.cc:656 +#, c-format +msgid "wrong argument count" +msgstr "" + +#: automate.cc:88 automate.cc:135 automate.cc:1183 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "VER1 [VER2 [VER3 [...]]]" #: 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 +#: automate.cc:365 automate.cc:369 automate.cc:429 automate.cc:454 +#: automate.cc:1193 cmd_list.cc:663 revision.cc:1705 #, c-format msgid "No such revision %s" msgstr "versão '%s' não existe" @@ -73,96 +83,99 @@ msgstr "VERSÂO_NOVA [VERSÂO_VELHA1 [VE msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "VERSÂO_NOVA [VERSÂO_VELHA1 [VERSÃO_VELHA2 [...]]]" -#: automate.cc:423 automate.cc:447 cmd_list.cc:652 revision.cc:1699 +#: automate.cc:398 automate.cc:486 automate.cc:711 automate.cc:942 +#: automate.cc:963 automate.cc:1249 cmd_automate.cc:78 cmd_automate.cc:332 +#: cmd_list.cc:564 +#, c-format +msgid "no arguments needed" +msgstr "" + +#: automate.cc:423 automate.cc:448 cmd_list.cc:653 revision.cc:1699 msgid "REV" msgstr "VERSÂO" -#: automate.cc:524 +#: automate.cc:526 msgid "SELECTOR" msgstr "SELETOR" -#: automate.cc:893 automate.cc:1023 +#: automate.cc:895 automate.cc:1025 msgid "[REVID]" msgstr "[VERSÂO]" -#: automate.cc:922 automate.cc:1045 automate.cc:1529 automate.cc:1588 -#: automate.cc:1593 +#: automate.cc:924 automate.cc:1047 automate.cc:1507 automate.cc:1566 +#: automate.cc:1571 #, c-format msgid "no revision %s found in database" msgstr "nenhuma versão %s encontrada no banco de dados" -#: automate.cc:1066 automate.cc:1145 -msgid "FILEID" -msgstr "ID-ARQUIVO" - -#: 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:1092 automate.cc:1118 cmd_merging.cc:845 +#: automate.cc:1069 automate.cc:1095 cmd_merging.cc:845 msgid "REVID" msgstr "VERSÂO" -#: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 +#: automate.cc:1080 automate.cc:1106 automate.cc:1161 automate.cc:1163 #: 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 +#: cmd_files.cc:138 cmd_files.cc:197 cmd_merging.cc:125 cmd_merging.cc:677 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:535 +#: cmd_ws_commit.cc:1023 commands.cc:413 #, c-format msgid "no such revision '%s'" msgstr "versão '%s' não existe" -#: automate.cc:1156 +#: automate.cc:1122 cmd_files.cc:250 +msgid "FILEID" +msgstr "ID-ARQUIVO" + +#: automate.cc:1133 #, c-format msgid "no such file '%s'" msgstr "arquivo '%s' não existe" -#: automate.cc:1172 +#: automate.cc:1149 msgid "OLD_FILE NEW_FILE" msgstr "ARQUIVO_VELHO NOVO_ARQUIVO" -#: automate.cc:1317 +#: automate.cc:1294 msgid "[BRANCH_PATTERN]" msgstr "[PADRÂO_DO_RAMOS]" -#: automate.cc:1413 +#: automate.cc:1391 msgid "KEYID PASSPHRASE" msgstr "CHAVE FRASE-CHAVE" -#: automate.cc:1431 cmd_key_cert.cc:42 +#: automate.cc:1409 cmd_key_cert.cc:42 #, c-format msgid "key '%s' already exists" msgstr "chave '%s' já existe" -#: automate.cc:1434 cmd_key_cert.cc:45 +#: automate.cc:1412 cmd_key_cert.cc:45 #, c-format msgid "generating key-pair '%s'" msgstr "gerando par de chaves '%s'" -#: automate.cc:1436 cmd_key_cert.cc:47 +#: automate.cc:1414 cmd_key_cert.cc:47 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "salvando par de chaves '%s' em %s/" -#: automate.cc:1472 +#: automate.cc:1450 msgid "OPTION" msgstr "OPÇÃO" -#: automate.cc:1495 +#: automate.cc:1473 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' não é uma opção conhecida para área de trabalho" -#: automate.cc:1518 +#: automate.cc:1496 msgid "REV FILE" msgstr "VERSÃO ARQUIVO" -#: automate.cc:1535 automate.cc:1599 +#: automate.cc:1513 automate.cc:1577 #, c-format msgid "file %s is unknown for revision %s" msgstr "arquivo %s é desconhecido para a versão %s" -#: automate.cc:1578 +#: automate.cc:1556 msgid "REV1 FILE REV2" msgstr "VER1 ARQUIVO VER2" @@ -246,27 +259,36 @@ msgstr "" "vários certificados de ramo encontrados para a versão %s, por favor forneça " "o nome de um ramo" -#: cmd_automate.cc:149 cmd_automate.cc:195 cmd_automate.cc:217 -#: cmd_automate.cc:340 -#, c-format -msgid "Bad input to automate stdio" +#: cmd_automate.cc:150 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected ':' after string size" 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:169 +#, fuzzy, c-format +msgid "Bad input to automate stdio: unexpected EOF" +msgstr "Entrada inválida para automate stdio" -#: cmd_automate.cc:169 +#: cmd_automate.cc:197 #, fuzzy, c-format -msgid "Bad input to automate stdio (unexpected EOF)" +msgid "Bad input to automate stdio: unknown start token '%c'" msgstr "Entrada inválida para automate stdio" -#: cmd_automate.cc:365 +#: cmd_automate.cc:219 +#, fuzzy, c-format +msgid "Bad input to automate stdio: expected '%c' token" +msgstr "Entrada inválida para automate stdio" + +#: cmd_automate.cc:344 +#, fuzzy, c-format +msgid "Bad input to automate stdio: command name is missing" +msgstr "Entrada inválida para automate stdio" + +#: cmd_automate.cc:373 msgid "automation" msgstr "automação" -#: cmd_automate.cc:366 +#: cmd_automate.cc:374 msgid "automation interface" msgstr "interface de automação" @@ -350,7 +372,7 @@ msgstr "nenhuma variável com nome %s no msgstr "nenhuma variável com nome %s no domínio %s" #: 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 +#: cmd_files.cc:220 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:429 #: commands.cc:275 msgid "informative" msgstr "informativo" @@ -373,8 +395,8 @@ msgstr "" 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 +#: cmd_diff_log.cc:465 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 +#: cmd_ws_commit.cc:349 cmd_ws_commit.cc:429 cmd_ws_commit.cc:735 msgid "[PATH]..." msgstr "[CAMINHO]..." @@ -421,7 +443,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:616 +#: cmd_diff_log.cc:617 #, c-format msgid "only one of --last/--next allowed" msgstr "apenas ou --last ou --next é permitido" @@ -512,19 +534,24 @@ msgstr "calcula identidade do CAMINHO ou msgid "calculate identity of PATH or stdin" msgstr "calcula identidade do CAMINHO ou stdin" -#: cmd_files.cc:182 +#: cmd_files.cc:185 +#, c-format +msgid "no file version %s found in database" +msgstr "nenhuma versão %s do arquivo achada no banco de dados" + +#: cmd_files.cc:210 cmd_files.cc:214 +#, c-format +msgid "no file '%s' found in revision '%s'" +msgstr "nenhum arquivo '%s' encontrado na versão '%s'" + +#: cmd_files.cc:221 cmd_files.cc:273 msgid "FILENAME" msgstr "ARQUIVO" -#: cmd_files.cc:183 +#: cmd_files.cc:222 msgid "write file from database to stdout" msgstr "escreve arquivo do banco de dados em stdout" -#: cmd_files.cc:212 cmd_files.cc:214 -#, c-format -msgid "no file '%s' found in revision '%s'" -msgstr "nenhum arquivo '%s' encontrado na versão '%s'" - #: cmd.hh:89 #, c-format msgid "non-hex digits in id" @@ -650,7 +677,7 @@ msgstr "NÃO-confiável" msgstr "NÃO-confiável" #: 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 +#: cmd_key_cert.cc:239 cmd_ws_commit.cc:202 msgid "review" msgstr "revisão" @@ -670,7 +697,7 @@ msgstr "anota os resultados de executar 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:223 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:223 cmd_ws_commit.cc:202 msgid "REVISION" msgstr "VERSÂO" @@ -701,7 +728,7 @@ msgstr "comentário vazio" msgid "empty comment" msgstr "comentário vazio" -#: cmd_list.cc:64 cmd_list.cc:676 +#: cmd_list.cc:64 cmd_list.cc:677 #, c-format msgid "no public key '%s' found in database" msgstr "chave pública '%s' não encontrada no banco de dados" @@ -787,9 +814,10 @@ msgstr "" "ou arquivos conhecidos, desconhecidos, intencionalmente ignorados,\n" "faltando ou que mudaram de estado" -#: 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 +#: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:349 +#: cmd_ws_commit.cc:385 cmd_ws_commit.cc:410 cmd_ws_commit.cc:635 +#: cmd_ws_commit.cc:735 msgid "workspace" msgstr "área de trabalho" @@ -909,8 +937,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:439 cmd_ws_commit.cc:925 -#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 +#: cmd_merging.cc:821 cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 +#: cmd_ws_commit.cc:1004 cmd_ws_commit.cc:1105 cmd_ws_commit.cc:1119 msgid "tree" msgstr "árvore" @@ -924,7 +952,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:463 +#: cmd_ws_commit.cc:519 #, c-format msgid "branch '%s' is empty" msgstr "ramo '%s' está vazio" @@ -1157,88 +1185,80 @@ 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:43 +#: cmd_netsync.cc:33 #, c-format msgid "setting default server to %s" msgstr "configurando servidor padrão para %s" -#: cmd_netsync.cc:49 +#: cmd_netsync.cc:40 #, c-format -msgid "no hostname given" -msgstr "nenhum nome de host dado" - -#: 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:79 cmd_netsync.cc:101 +#: cmd_netsync.cc:72 #, c-format msgid "no branch pattern given" msgstr "nenhum padrão de ramos dado" -#: cmd_netsync.cc:88 +#: cmd_netsync.cc:80 #, c-format msgid "setting default branch include pattern to '%s'" msgstr "configurando padrão de inclusão de ramos para '%s'" -#: cmd_netsync.cc:95 +#: cmd_netsync.cc:86 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "configurando padrão de exclusão de ramos para '%s'" -#: cmd_netsync.cc:103 +#: cmd_netsync.cc:93 #, 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:119 cmd_netsync.cc:132 cmd_netsync.cc:147 cmd_netsync.cc:191 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184 msgid "network" msgstr "rede" -#: cmd_netsync.cc:119 cmd_netsync.cc:132 cmd_netsync.cc:147 +#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ENDEREÇO[:PORTA] [PADRÃO]]" -#: cmd_netsync.cc:120 +#: cmd_netsync.cc:110 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:133 +#: cmd_netsync.cc:124 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:141 +#: cmd_netsync.cc:132 #, 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:148 +#: cmd_netsync.cc:139 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:167 +#: cmd_netsync.cc:160 #, c-format msgid "pid file '%s' already exists" msgstr "arquivo pid '%s' já existe" -#: cmd_netsync.cc:169 +#: cmd_netsync.cc:162 #, c-format msgid "failed to create pid file '%s'" msgstr "erro criando arquivo de PID '%s'" -#: cmd_netsync.cc:191 -msgid "PATTERN ..." -msgstr "PADRÂO..." - -#: cmd_netsync.cc:192 -msgid "serve the branches specified by PATTERNs to connecting clients" +#: cmd_netsync.cc:185 +#, fuzzy +msgid "serve the database to connecting clients" msgstr "serve os ramos especificados por PADRÂO para clientes" -#: cmd_netsync.cc:208 +#: cmd_netsync.cc:201 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1246,7 +1266,7 @@ msgstr "" "é necessária permissão para salvar frase-passe persistentemente (veja gancho " "persist_phrase_ok())" -#: cmd_netsync.cc:214 +#: cmd_netsync.cc:207 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1327,7 +1347,11 @@ msgstr[1] "lidos %d pacotes" msgstr[0] "lido %d pacote" msgstr[1] "lidos %d pacotes" -#: cmd_ws_commit.cc:45 +#: cmd_ws_commit.cc:43 +msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" +msgstr "" + +#: cmd_ws_commit.cc:46 msgid "" "Enter a description of this change.\n" "Lines beginning with `MTN:' are removed automatically." @@ -1335,73 +1359,98 @@ msgstr "" "Entre uma descrição para esta mudança.\n" "Linhas iniciadas por `MTN:' serão removidas automaticamente." -#: cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:71 #, c-format msgid "edit of log message failed" msgstr "edição de mensagem de registro falhou" -#: cmd_ws_commit.cc:67 +#: cmd_ws_commit.cc:74 +#, fuzzy, c-format +msgid "failed to remove magic line; commit cancelled" +msgstr "entrada no registro vazia, gravação cancelada" + +#: cmd_ws_commit.cc:80 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "reverte arquivo(s), diretório(s) ou a área de trabalho inteira (\".\")" -#: cmd_ws_commit.cc:75 +#: cmd_ws_commit.cc:88 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "pelo menos um caminho deve ser passado para 'revert' (maybe '.')" -#: cmd_ws_commit.cc:95 +#: cmd_ws_commit.cc:108 #, c-format msgid "no missing files to revert" msgstr "nenhum arquivo desaparecido para reverter" -#: cmd_ws_commit.cc:150 +#: cmd_ws_commit.cc:163 #, c-format msgid "reverting %s" msgstr "revertendo %s" -#: cmd_ws_commit.cc:154 +#: cmd_ws_commit.cc:167 #, c-format msgid "no file version %s found in database for %s" msgstr "nenhuma versão %s do arquivo achada no banco de dados para %s" -#: cmd_ws_commit.cc:167 +#: cmd_ws_commit.cc:180 #, c-format msgid "recreating %s/" msgstr "recriando %s/" -#: cmd_ws_commit.cc:190 +#: cmd_ws_commit.cc:203 msgid "disapprove of a particular revision" msgstr "desaprova a versão especificada" -#: cmd_ws_commit.cc:206 +#: cmd_ws_commit.cc:219 #, 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:210 +#: cmd_ws_commit.cc:223 #, c-format msgid "need --branch argument for disapproval" msgstr "argumento --branch necessário para desaprovação" -#: cmd_ws_commit.cc:253 +#: cmd_ws_commit.cc:264 +#, fuzzy +msgid "[DIRECTORY...]" +msgstr "[DIRETÓRIO]" + +#: cmd_ws_commit.cc:265 +#, fuzzy +msgid "create one or more directories and add them to the workspace" +msgstr "renomeia entradas na área de trabalho" + +#: cmd_ws_commit.cc:285 +#, fuzzy, c-format +msgid "directory '%s' already exists" +msgstr "diretório de saída '%s' já existe" + +#: cmd_ws_commit.cc:292 +#, c-format +msgid "ignoring directory '%s' [see .mtn-ignore]" +msgstr "" + +#: cmd_ws_commit.cc:309 msgid "add files to workspace" msgstr "adiciona arquivos à área de trabalho" -#: cmd_ws_commit.cc:260 +#: cmd_ws_commit.cc:316 #, c-format msgid "cannot set '--unknown' and '--recursive' at the same time" msgstr "" -#: cmd_ws_commit.cc:262 +#: cmd_ws_commit.cc:318 #, c-format msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" msgstr "" -#: cmd_ws_commit.cc:294 +#: cmd_ws_commit.cc:350 msgid "drop files from workspace" msgstr "remove arquivos da área de trabalho" -#: cmd_ws_commit.cc:330 +#: cmd_ws_commit.cc:386 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1409,15 +1458,15 @@ msgstr "" "ORIGEM DESTINO\n" "ORIGEM1 [ORIGEM2 [...]] DIRETÓRIO_DESTINO" -#: cmd_ws_commit.cc:332 +#: cmd_ws_commit.cc:388 msgid "rename entries in the workspace" msgstr "renomeia entradas na área de trabalho" -#: cmd_ws_commit.cc:354 +#: cmd_ws_commit.cc:410 msgid "NEW_ROOT PUT_OLD" msgstr "NOVA_RAIZ COLOCAR_O_ANTIGO" -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:411 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1431,31 +1480,31 @@ msgstr "" "COLOCAR_O_ANTIGO.\n" "Usar --execute é altamente recomendado." -#: cmd_ws_commit.cc:373 +#: cmd_ws_commit.cc:429 msgid "show status of workspace" msgstr "mostra status da área de trabalho" -#: cmd_ws_commit.cc:402 +#: cmd_ws_commit.cc:458 #, c-format msgid "Current branch: %s" msgstr "Ramo atual: %s" -#: cmd_ws_commit.cc:408 +#: cmd_ws_commit.cc:464 #, c-format msgid "Changes against parent %s" msgstr "Diferenças entre o pai %s" -#: cmd_ws_commit.cc:413 +#: cmd_ws_commit.cc:469 #, c-format msgid " no changes" msgstr " sem mudanças" -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:473 #, c-format msgid " dropped %s" msgstr " %s descartado" -#: cmd_ws_commit.cc:422 +#: cmd_ws_commit.cc:478 #, c-format msgid "" " renamed %s\n" @@ -1464,21 +1513,21 @@ msgstr "" " %s foi renomeado\n" " para %s" -#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 +#: cmd_ws_commit.cc:483 cmd_ws_commit.cc:487 #, c-format msgid " added %s" msgstr " %s foi adicionado" -#: cmd_ws_commit.cc:435 +#: cmd_ws_commit.cc:491 #, c-format msgid " patched %s" msgstr " %s foi modificado" -#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 +#: cmd_ws_commit.cc:495 cmd_ws_commit.cc:981 cmd_ws_commit.cc:1105 msgid "[DIRECTORY]" msgstr "[DIRETÓRIO]" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:496 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" @@ -1491,47 +1540,47 @@ msgstr "" "Se nenhum nome de diretório for dado, o nome do ramo será usado como\n" "diretório" -#: cmd_ws_commit.cc:458 +#: cmd_ws_commit.cc:514 cmd_ws_commit.cc:1048 #, 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:466 +#: cmd_ws_commit.cc:522 cmd_ws_commit.cc:1054 #, c-format msgid "branch %s has multiple heads:" msgstr "ramo %s tem frentes múltiplas:" -#: cmd_ws_commit.cc:469 +#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1057 #, c-format msgid "choose one with '%s checkout -r'" msgstr "escolha um com '%s update -r'" -#: cmd_ws_commit.cc:470 +#: cmd_ws_commit.cc:526 cmd_ws_commit.cc:1058 #, c-format msgid "branch %s has multiple heads" msgstr "ramo %s tem frentes múltiplas" -#: cmd_ws_commit.cc:497 +#: cmd_ws_commit.cc:553 cmd_ws_commit.cc:1041 #, 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:514 +#: cmd_ws_commit.cc:570 #, c-format msgid "you must specify a destination directory" msgstr "um diretório de destino deve ser especificado" -#: cmd_ws_commit.cc:527 +#: cmd_ws_commit.cc:583 #, c-format msgid "checkout directory '%s' already exists" msgstr "diretório de saída '%s' já existe" -#: cmd_ws_commit.cc:561 +#: cmd_ws_commit.cc:617 #, 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:579 +#: cmd_ws_commit.cc:635 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1541,45 +1590,45 @@ msgstr "" "get CAMINHO [ATRIBUTO]\n" "drop CAMINHO [ATRIBUTO]" -#: cmd_ws_commit.cc:580 +#: cmd_ws_commit.cc:636 msgid "set, get or drop file attributes" msgstr "configura, lê ou descarta atributos de arquivos" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:653 #, c-format msgid "Unknown path '%s'" msgstr "caminho desconhecido '%s'" -#: cmd_ws_commit.cc:626 +#: cmd_ws_commit.cc:682 #, fuzzy, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Caminho '%s' não tem atributo '%s'\n" -#: cmd_ws_commit.cc:656 +#: cmd_ws_commit.cc:712 #, c-format msgid "No attributes for '%s'" msgstr "Nenhum atributo para '%s'" -#: cmd_ws_commit.cc:667 +#: cmd_ws_commit.cc:723 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Nenhum atributo '%s' no caminho '%s'" -#: cmd_ws_commit.cc:680 +#: cmd_ws_commit.cc:736 msgid "commit workspace to database" msgstr "grava mudanças da área de trabalho no banco de dados" -#: cmd_ws_commit.cc:711 +#: cmd_ws_commit.cc:767 #, c-format msgid "no changes to commit" msgstr "nenhuma mudança para gravar" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:787 #, c-format msgid "beginning commit on branch '%s'" msgstr "iniciando gravação do ramo '%s'" -#: cmd_ws_commit.cc:740 +#: cmd_ws_commit.cc:796 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1591,37 +1640,37 @@ msgstr "" "considere mover ou apagar _MTN/log,\n" "ou remova --message/--message-from-file da linha de comando" -#: cmd_ws_commit.cc:755 +#: cmd_ws_commit.cc:811 #, c-format msgid "empty log message; commit canceled" msgstr "entrada no registro vazia, gravação cancelada" -#: cmd_ws_commit.cc:777 +#: cmd_ws_commit.cc:833 #, c-format msgid "log message rejected by hook: %s" msgstr "entrada no registro rejeitada pelo hook: %s" -#: cmd_ws_commit.cc:785 +#: cmd_ws_commit.cc:841 #, c-format msgid "revision %s already in database" msgstr "versão %s já está no banco de dados" -#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 +#: cmd_ws_commit.cc:880 cmd_ws_commit.cc:910 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "arquivo '%s' modificado durante gravação, abortando" -#: cmd_ws_commit.cc:836 +#: cmd_ws_commit.cc:892 #, 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:886 +#: cmd_ws_commit.cc:942 #, c-format msgid "committed revision %s" msgstr "versão %s gravada" -#: cmd_ws_commit.cc:892 +#: cmd_ws_commit.cc:948 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1630,16 +1679,42 @@ msgstr "" "nota: esta versão cria divergência\n" "nota: talvez você queira executar '%s merge'" -#: cmd_ws_commit.cc:926 +#: cmd_ws_commit.cc:982 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:932 +#: cmd_ws_commit.cc:988 #, c-format msgid "need --branch argument for setup" msgstr "argumento --branch é necessário para configuração" -#: cmd_ws_commit.cc:949 +#: cmd_ws_commit.cc:1004 +#, fuzzy +msgid "DIRECTORY" +msgstr "[DIRETÓRIO]" + +#: cmd_ws_commit.cc:1005 +msgid "import the contents of the given directory tree into a given branch" +msgstr "" + +#: cmd_ws_commit.cc:1016 +#, fuzzy, c-format +msgid "you must specify a directory to import" +msgstr "um diretório de destino deve ser especificado" + +#: cmd_ws_commit.cc:1067 +#, fuzzy, c-format +msgid "import directory '%s' doesn't exists" +msgstr "Diretório '%s' não existe" + +#: cmd_ws_commit.cc:1068 +#, fuzzy, c-format +msgid "import directory '%s' is a file" +msgstr "" +"não foi possível criar diretório '%s'\n" +"ele é um arquivo" + +#: cmd_ws_commit.cc:1106 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -1647,7 +1722,7 @@ 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:962 +#: cmd_ws_commit.cc:1119 msgid "refresh the inodeprint cache" msgstr "atualiza o cache de inodeprint" @@ -1728,7 +1803,7 @@ msgstr "marcas" msgid "markings" msgstr "marcas" -#: database_check.cc:306 netsync.cc:2969 rcs_import.cc:1244 +#: database_check.cc:306 netsync.cc:3063 rcs_import.cc:1244 msgid "revisions" msgstr "versões" @@ -1736,7 +1811,7 @@ msgstr "descendência" msgid "ancestry" msgstr "descendência" -#: database_check.cc:434 netsync.cc:2973 +#: database_check.cc:434 netsync.cc:3067 msgid "keys" msgstr "chaves" @@ -2192,27 +2267,27 @@ msgstr "%d linhas pedidas, %d linhas obt msgid "wanted %d rows got %d in query: %s" msgstr "%d linhas pedidas, %d linhas obtidas da consulta: %s" -#: database.cc:2040 +#: database.cc:2043 #, c-format msgid "another key with name '%s' already exists" msgstr "outra chave com nome '%s' já existe" -#: database.cc:3037 +#: database.cc:3041 #, c-format msgid "no database specified" msgstr "nenhum banco de dados especificado" -#: database.cc:3045 +#: database.cc:3049 #, c-format msgid "database %s does not exist" msgstr "banco de dados %s não existe" -#: database.cc:3046 +#: database.cc:3050 #, c-format msgid "%s is a directory, not a database" msgstr "%s é um diretório, não um banco de dados" -#: database.cc:3071 +#: database.cc:3075 #, c-format msgid "could not open database '%s': %s" msgstr "erro abrindo banco de dados '%s': %s" @@ -2247,7 +2322,7 @@ msgstr "" "[ direita] %s\n" "[combinado] %s\n" -#: file_io.cc:176 file_io.cc:183 +#: file_io.cc:194 file_io.cc:201 #, c-format msgid "" "could not create directory '%s'\n" @@ -2256,7 +2331,7 @@ msgstr "" "não foi possível criar diretório '%s'\n" "ele é um arquivo" -#: file_io.cc:178 +#: file_io.cc:196 #, c-format msgid "" "could not create directory '%s'\n" @@ -2265,17 +2340,17 @@ msgstr "" "não foi possível criar diretório '%s'\n" "%s" -#: file_io.cc:182 +#: file_io.cc:200 #, c-format msgid "could not create directory '%s'" msgstr "não foi possível criar diretório '%s'" -#: file_io.cc:195 +#: file_io.cc:213 #, c-format msgid "failed to create directory '%s' for '%s'" msgstr "falha criando diretório '%s' para '%s'" -#: file_io.cc:209 +#: file_io.cc:227 #, c-format msgid "" "could not remove '%s'\n" @@ -2284,107 +2359,107 @@ msgstr "" "impossível remover '%s'\n" "%s" -#: file_io.cc:219 +#: file_io.cc:237 #, c-format msgid "file to delete '%s' does not exist" msgstr "arquivo '%s' a ser apagado não existe" -#: file_io.cc:220 +#: file_io.cc:238 #, c-format msgid "file to delete, '%s', is not a file but a directory" msgstr "arquivo a ser apagado, '%s', não é um arquivo mas um diretório" -#: file_io.cc:228 +#: file_io.cc:246 #, c-format msgid "directory to delete '%s' does not exist" msgstr "diretório '%s' a ser apagado não existe" -#: file_io.cc:229 +#: file_io.cc:247 #, c-format msgid "directory to delete, '%s', is not a directory but a file" msgstr "diretório '%s' a ser apagado não é um diretório, mas um arquivo" -#: file_io.cc:236 +#: file_io.cc:254 #, c-format msgid "object to delete, '%s', does not exist" msgstr "objeto '%s' a ser apagado não existe" -#: file_io.cc:244 +#: file_io.cc:262 #, c-format msgid "directory to delete, '%s', does not exist" msgstr "o diretório a ser apagado, '%s', não existe" -#: file_io.cc:245 +#: file_io.cc:263 #, c-format msgid "directory to delete, '%s', is a file" msgstr "o diretório a ser apagado, '%s', é um arquivo" -#: file_io.cc:254 +#: file_io.cc:272 #, c-format msgid "rename source file '%s' does not exist" msgstr "arquivo '%s' a ser renomeado não existe" -#: file_io.cc:255 +#: file_io.cc:273 #, c-format msgid "rename source file '%s' is a directory -- bug in monotone?" msgstr "arquivo '%s' a ser renomeado é um diretório -- bug em monotone?" -#: file_io.cc:258 file_io.cc:271 +#: file_io.cc:276 file_io.cc:289 #, c-format msgid "rename target '%s' already exists" msgstr "alvo da renomeação '%s' já existe" -#: file_io.cc:267 +#: file_io.cc:285 #, c-format msgid "rename source dir '%s' does not exist" msgstr "diretório '%s' a ser renomeado não existe" -#: file_io.cc:268 +#: file_io.cc:286 #, c-format msgid "rename source dir '%s' is a file -- bug in monotone?" msgstr "diretório '%s' a ser renomeado é um arquivo -- defeito em monotone?" -#: file_io.cc:282 +#: file_io.cc:300 #, c-format msgid "rename source path '%s' does not exist" msgstr "caminho '%s' a ser renomeado não existe" -#: file_io.cc:297 +#: file_io.cc:315 #, c-format msgid "file %s does not exist" msgstr "arquivo %s não existe" -#: file_io.cc:298 +#: file_io.cc:316 #, c-format msgid "file %s cannot be read as data; it is a directory" msgstr "arquivo %s não pode ser lido como dados, é um diretório" -#: file_io.cc:302 +#: file_io.cc:320 #, c-format msgid "cannot open file %s for reading" msgstr "impossível abrir arquivo %s para leitura" -#: file_io.cc:341 +#: file_io.cc:359 #, c-format msgid "Cannot read standard input multiple times" msgstr "Impossível ler entrada padrão múltiplas vezes" -#: file_io.cc:372 +#: file_io.cc:390 #, c-format msgid "file '%s' cannot be overwritten as data; it is a directory" msgstr "arquivo '%s' não pode ser sobrescrito com dados, é um diretório" -#: file_io.cc:380 +#: file_io.cc:398 #, c-format msgid "cannot open file %s for writing" msgstr "impossível abrir arquivo %s para escrita" -#: file_io.cc:437 +#: file_io.cc:455 #, c-format 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 work.cc:1079 +#: file_io.cc:548 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "arquivo ou diretório inexistente: '%s'" @@ -2429,22 +2504,22 @@ msgstr "frase-chave para '%s' está inco msgid "passphrase for '%s' is incorrect" msgstr "frase-chave para '%s' está incorreta" -#: lua.cc:462 lua.cc:476 +#: lua.cc:463 lua.cc:477 lua.cc:512 #, c-format msgid "%s called with an invalid parameter" msgstr "%s chamado com um parâmetro inválido" -#: lua.cc:479 +#: lua.cc:480 lua.cc:515 #, c-format msgid "Directory '%s' does not exist" msgstr "Diretório '%s' não existe" -#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 +#: lua.cc:481 lua.cc:516 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "'%s' não é um diretório" -#: lua.cc:499 +#: lua.cc:500 lua.cc:538 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "erro lua ao carregar arquivo Lua '%s'" @@ -2581,41 +2656,41 @@ msgstr "verificação de '%s' falhou" msgid "check of '%s' failed" msgstr "verificação de '%s' falhou" -#: netsync.cc:724 +#: netsync.cc:760 msgid "bytes in" msgstr "bytes ↓" -#: netsync.cc:726 +#: netsync.cc:762 msgid "bytes out" msgstr "bytes ↑" -#: netsync.cc:730 +#: netsync.cc:766 msgid "certs in" msgstr "cert. ↓" -#: netsync.cc:732 netsync.cc:745 +#: netsync.cc:768 netsync.cc:781 msgid "revs in" msgstr "ver. ↓" -#: netsync.cc:737 +#: netsync.cc:773 msgid "certs out" msgstr "cert. ↑" -#: netsync.cc:739 netsync.cc:747 +#: netsync.cc:775 netsync.cc:783 msgid "revs out" msgstr "ver. ↑" -#: netsync.cc:853 +#: netsync.cc:889 #, c-format msgid "underflow on count of %s items to receive" msgstr "contagem insuficiente de %s itens a receber" -#: netsync.cc:1201 +#: netsync.cc:1261 netsync.cc:1269 #, c-format msgid "received network error: %s" msgstr "erro de rede recebido: %s" -#: netsync.cc:1236 +#: netsync.cc:1304 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2636,12 +2711,12 @@ msgstr "" "Eu esperava %s\n" "'%s unset %s %s' sobrecarrega este teste" -#: netsync.cc:1246 +#: netsync.cc:1314 #, c-format msgid "server key changed" msgstr "a chave do servidor mudou" -#: netsync.cc:1251 +#: netsync.cc:1319 #, fuzzy, c-format msgid "" "first time connecting to server %s\n" @@ -2652,58 +2727,53 @@ msgstr "" "vou supor que é mesmo ele, mas você pode querer verificar\n" "a impressão digital da chave deles: %s\n" -#: netsync.cc:1258 +#: netsync.cc:1326 #, c-format msgid "saving public key for %s to database" msgstr "gravando chave pública de %s no banco de dados" -#: netsync.cc:1352 +#: netsync.cc:1429 #, c-format msgid "rejected attempt at anonymous connection for write" msgstr "tentativa de conexão anônima para gravação foi rejeitada" -#: netsync.cc:1358 +#: netsync.cc:1436 #, c-format msgid "rejected attempt at anonymous connection while running as sink" msgstr "" "tentativa de conexão anônima enquanto executando como\n" "sorvedouro foi rejeitada" -#: netsync.cc:1372 netsync.cc:1496 +#: netsync.cc:1452 #, c-format -msgid "not serving branch '%s'" -msgstr "ramo '%s' não está sendo servido" - -#: netsync.cc:1377 -#, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "acesso anônimo ao ramo '%s' negado pelo servidor" -#: netsync.cc:1385 +#: netsync.cc:1460 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'" msgstr "" "permissão de leitura anônima para '%s' foi dada\n" "com exclusão de '%s'" -#: netsync.cc:1391 +#: netsync.cc:1466 #, c-format msgid "allowed anonymous read/write permission for '%s' excluding '%s'" msgstr "" "permissão de leitura/escrita anônima para '%s' foi dada\n" "com exclusão de '%s'" -#: netsync.cc:1447 +#: netsync.cc:1531 #, c-format -msgid "detected replay attack in auth netcmd" -msgstr "detectado ataque de repetição no comando de autenticação" +msgid "remote public key hash '%s' is unknown" +msgstr "hash da chave remota '%s' é desconhecido" -#: netsync.cc:1468 +#: netsync.cc:1549 #, c-format -msgid "remote public key hash '%s' is unknown" -msgstr "hash da chave remota '%s' é desconhecido" +msgid "detected replay attack in auth netcmd" +msgstr "detectado ataque de repetição no comando de autenticação" -#: netsync.cc:1484 +#: netsync.cc:1571 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " @@ -2712,7 +2782,7 @@ msgstr "" "negada a '%s' permissão de leitura para '%s' excluindo '%s'\n" "enquanto executando como saída pura" -#: netsync.cc:1501 +#: netsync.cc:1584 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'" @@ -2720,12 +2790,12 @@ msgstr "" "negada a '%s' permissão de leitura para '%s' excluindo '%s' por causa\n" "do ramo '%s'" -#: netsync.cc:1511 +#: netsync.cc:1594 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'" msgstr "permitida a '%s' permissão de leitura para '%s' excluindo '%s'" -#: netsync.cc:1521 +#: netsync.cc:1605 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -2734,144 +2804,144 @@ msgstr "" "negada a '%s' permissão de escrita para '%s' excluindo '%s' durante\n" "execução como fonte puro" -#: netsync.cc:1528 +#: netsync.cc:1613 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'" msgstr "negada a '%s' permissão de escrita para '%s' excluindo '%s'" -#: netsync.cc:1532 +#: netsync.cc:1617 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'" msgstr "permitida a '%s' permissão de escrita para '%s' excluindo '%s'" -#: netsync.cc:1556 +#: netsync.cc:1641 #, c-format msgid "bad client signature" msgstr "assinatura do cliente inválida" -#: netsync.cc:1572 +#: netsync.cc:1657 #, c-format msgid "Unexpected 'refine' command on non-refined item type" msgstr "Comando 'refinar' não esperado em tipo de item não-refinado" -#: netsync.cc:1669 +#: netsync.cc:1754 #, c-format msgid "unknown bye phase %d received" msgstr "fase de despedida desconhecida %d recebida" -#: netsync.cc:1684 +#: netsync.cc:1769 #, c-format msgid "Unexpected 'done' command on non-refined item type" msgstr "Comando 'feito' inesperado em tipo de item não-refinado" -#: netsync.cc:1756 +#: netsync.cc:1841 #, c-format 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:1859 +#: netsync.cc:1945 #, 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:1877 +#: netsync.cc:1963 #, 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:1891 +#: netsync.cc:1977 #, 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:1953 +#: netsync.cc:2039 #, c-format msgid "Received warning from usher: %s" msgstr "Recebido aviso do usher: %s" -#: netsync.cc:2040 netsync.cc:2071 +#: netsync.cc:2126 netsync.cc:2157 msgid "source and sink" msgstr "entrada e saída" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "source" msgstr "entrada" -#: netsync.cc:2041 netsync.cc:2072 +#: netsync.cc:2127 netsync.cc:2158 msgid "sink" msgstr "saída" -#: netsync.cc:2228 +#: netsync.cc:2314 #, 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:2240 netsync.cc:2339 +#: netsync.cc:2326 netsync.cc:2425 #, c-format msgid "protocol error while processing peer %s: '%s'" msgstr "erro de protocolo durante processamento do par %s: '%s'" -#: netsync.cc:2246 +#: netsync.cc:2332 #, c-format msgid "error: %s" msgstr "erro: %s" -#: netsync.cc:2310 +#: netsync.cc:2396 #, c-format msgid "connecting to %s" msgstr "conectando a %s" -#: netsync.cc:2354 +#: netsync.cc:2440 #, 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:2377 +#: netsync.cc:2463 #, 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:2394 +#: netsync.cc:2480 #, c-format msgid "successful exchange with %s" msgstr "comunicação feita com sucesso com %s" -#: netsync.cc:2400 +#: netsync.cc:2486 #, 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:2405 +#: netsync.cc:2491 #, 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:2471 +#: netsync.cc:2557 #, 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:2503 +#: netsync.cc:2589 #, c-format msgid "accepted new client connection from %s : %s" msgstr "nova conexão do cliente %s aceita: %s" -#: netsync.cc:2540 +#: netsync.cc:2626 #, 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:2551 +#: netsync.cc:2637 #, c-format msgid "peer %s read failed in working state (error)" msgstr "leitura do par %s falhou no estado trabalhando (erro)" -#: netsync.cc:2556 +#: netsync.cc:2642 #, fuzzy, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)" @@ -2879,17 +2949,17 @@ msgstr "" "leitura do par %s falhou no estado de encerramento (provavelmente o\n" "cliente reportou o erro erroneamente)\n" -#: netsync.cc:2562 +#: netsync.cc:2648 #, c-format msgid "peer %s read failed in confirmed state (success)" msgstr "leitura do par %s falhou no estado confirmado (sucesso)" -#: netsync.cc:2583 +#: netsync.cc:2669 #, c-format msgid "peer %s write failed in working state (error)" msgstr "escrita no par %s falhou no estado trabalhando (erro)" -#: netsync.cc:2588 +#: netsync.cc:2674 #, fuzzy, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)" @@ -2897,65 +2967,70 @@ msgstr "" "escrita no par %s falhou no estado de encerramento (provavelmente o\n" "cliente reportou o erro erroneamente)\n" -#: netsync.cc:2594 +#: netsync.cc:2680 #, c-format msgid "peer %s write failed in confirmed state (success)" msgstr "escrita no par %s falhou em um estado confirmado (sucesso)" -#: netsync.cc:2621 +#: netsync.cc:2707 #, c-format msgid "peer %s processing finished, disconnecting" msgstr "processamento do par %s terminou, desconectando" -#: netsync.cc:2643 +#: netsync.cc:2729 #, 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:2711 +#: netsync.cc:2797 #, c-format msgid "beginning service on %s : %s" msgstr "iniciando serviço em %s : %s" -#: netsync.cc:2712 +#: netsync.cc:2798 msgid "" msgstr "" -#: netsync.cc:2726 +#: netsync.cc:2812 #, 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:2791 +#: netsync.cc:2879 +#, fuzzy, c-format +msgid "Network error on peer %s, disconnecting" +msgstr "recebido OOB do par %s, desconectando" + +#: netsync.cc:2885 #, c-format msgid "got OOB from peer %s, disconnecting" msgstr "recebido OOB do par %s, desconectando" -#: netsync.cc:2851 +#: netsync.cc:2945 #, c-format msgid "beginning service on %s" msgstr "iniciando serviço em %s" -#: netsync.cc:2914 +#: netsync.cc:3008 #, 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:2963 +#: netsync.cc:3057 #, c-format msgid "finding items to synchronize:" msgstr "encontrando itens para sincronizar:" -#: netsync.cc:2971 +#: netsync.cc:3065 msgid "certificates" msgstr "certificados" -#: netsync.cc:3084 +#: netsync.cc:3178 #, c-format msgid "Cannot find key '%s'" msgstr "Impossível achar chave '%s'" -#: netsync.cc:3124 +#: netsync.cc:3218 #, fuzzy, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -2964,7 +3039,7 @@ msgstr "" "padrão de inclusão de ramos contém um caractere de aspas:\n" "%s\n" -#: netsync.cc:3130 +#: netsync.cc:3224 #, fuzzy, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -2973,7 +3048,7 @@ msgstr "" "padrão de exclusão de ramos contém um caractere de aspas:\n" "%s\n" -#: netsync.cc:3165 netsync.cc:3169 +#: netsync.cc:3259 netsync.cc:3263 #, c-format msgid "network error: %s" msgstr "erro de rede: %s" @@ -2986,7 +3061,7 @@ msgstr "tamanho do bloco em bytes para s msgid "block size in bytes for \"automate stdio\" output" msgstr "tamanho do bloco em bytes para saída de \"automate stdio\"" -#: options_list.hh:32 options_list.hh:309 options_list.hh:352 +#: options_list.hh:32 options_list.hh:317 options_list.hh:360 #, fuzzy, c-format msgid "cannot be zero or negative" msgstr "argumento ilegal para --last: não pode ser zero ou negativo\n" @@ -3067,140 +3142,148 @@ msgstr "quando criando inventórios, des msgstr "quando criando inventórios, descarta atributos com a chave dada" #: options_list.hh:228 +msgid "don't perform the operation, just show what would have happened" +msgstr "" + +#: options_list.hh:236 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 +#: options_list.hh:245 msgid "leave out anything described by its argument" msgstr "exclui qualquer coisa descrita pelo seu argumento" -#: options_list.hh:245 +#: options_list.hh:253 msgid "perform the associated file operation" msgstr "executa a operação associada ao arquivo" -#: options_list.hh:253 +#: options_list.hh:261 msgid "print detailed version number, then exit" msgstr "exibe número de versão detalhado e sai" -#: options_list.hh:260 +#: options_list.hh:268 msgid "display help message" msgstr "exibe mensagem de ajuda" -#: options_list.hh:269 +#: options_list.hh:277 #, fuzzy msgid "include anything described by its argument" msgstr "exclui qualquer coisa descrita pelo seu argumento" -#: options_list.hh:277 +#: options_list.hh:285 msgid "set key for signatures" msgstr "configura a chave para assinaturas" -#: options_list.hh:285 +#: options_list.hh:293 msgid "set location of key store" msgstr "configura localização da coleção de chaves" -#: options_list.hh:294 +#: options_list.hh:302 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:304 +#: options_list.hh:312 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:313 +#: options_list.hh:321 msgid "file to write the log to" msgstr "arquivo onde registro será escrito" -#: options_list.hh:324 +#: options_list.hh:332 msgid "set commit changelog message" msgstr "informa a mensagem de gravação" -#: options_list.hh:331 +#: options_list.hh:339 msgid "set filename containing commit changelog message" msgstr "informa o arquivo que contém a mensagem de gravação" -#: options_list.hh:339 +#: options_list.hh:347 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 +#: options_list.hh:355 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:357 +#: options_list.hh:365 msgid "exclude files when printing logs" msgstr "exclui arquivos quando imprime os registros" -#: options_list.hh:365 +#: options_list.hh:373 msgid "do not ignore any files" msgstr "" -#: options_list.hh:373 +#: options_list.hh:381 msgid "exclude merges when printing logs" msgstr "exclui combinações quando exibe os registros" -#: options_list.hh:381 +#: options_list.hh:389 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:389 +#: options_list.hh:397 msgid "do not load standard lua hooks" msgstr "não carrega hooks Lua padrão" -#: options_list.hh:397 +#: options_list.hh:405 msgid "record process id of server" msgstr "grava o ID do processo do servidor" -#: options_list.hh:405 +#: options_list.hh:413 msgid "suppress verbose, informational and progress messages" msgstr "suprime mensagens detalhadas, informativas e de progresso" -#: options_list.hh:415 +#: options_list.hh:423 msgid "load extra rc file" msgstr "carrega arquivo Lua extra" -#: options_list.hh:423 +#: options_list.hh:431 msgid "suppress warning, verbose, informational and progress messages" msgstr "suprime mensagens de aviso, detalhadas, informativas e de progresso" -#: options_list.hh:433 +#: options_list.hh:441 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:442 +#: options_list.hh:450 msgid "select revision id for operation" msgstr "seleciona ID da versão para operação" -#: options_list.hh:450 +#: options_list.hh:458 msgid "limit search for workspace to specified root" msgstr "limita a procura por uma área de trabalho à raiz especificada" -#: options_list.hh:458 +#: options_list.hh:466 msgid "use the current arguments as the future default" msgstr "usa os argumentos atuais como futuros padrões" -#: options_list.hh:466 +#: options_list.hh:474 msgid "set ticker style (count|dot|none)" msgstr "configura estilo do contador (count|dot|none)" -#: options_list.hh:477 +#: options_list.hh:485 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "" -#: options_list.hh:482 +#: options_list.hh:489 +msgid "revision(s) to stop logging at" +msgstr "" + +#: options_list.hh:497 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 +#: options_list.hh:506 msgid "verbose completion output" msgstr "saída mais detalhada" -#: options_list.hh:498 +#: options_list.hh:514 msgid "print version number, then exit" msgstr "exibe número de versão e sai" -#: options_list.hh:506 +#: options_list.hh:522 msgid "insert command line arguments taken from the given file" msgstr "insere argumentos de linha de comando retirados do arquivo dado" @@ -3317,6 +3400,28 @@ msgstr "etiquetas" msgid "tags" msgstr "etiquetas" +#: restrictions.cc:60 restrictions.cc:77 +#, c-format +msgid "conflicting include/exclude on path '%s'" +msgstr "" + +#: restrictions.cc:103 restrictions.cc:141 +#, c-format +msgid "restriction includes unknown path '%s'" +msgstr "" + +#: restrictions.cc:114 restrictions.cc:155 +#, c-format +msgid "restriction excludes unknown path '%s'" +msgstr "" + +#: restrictions.cc:118 restrictions.cc:159 +#, fuzzy, c-format +msgid "%d unknown path" +msgid_plural "%d unknown paths" +msgstr[0] "caminho desconhecido '%s'" +msgstr[1] "caminho desconhecido '%s'" + #: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" @@ -3925,6 +4030,18 @@ msgstr "" msgstr "" "esta área de trabalho está no formato atual, nenhuma migração é necessária" +#~ msgid "read from client failed with error code: %d" +#~ msgstr "leitura do cliente falhou com código de erro: %d" + +#~ msgid "no hostname given" +#~ msgstr "nenhum nome de host dado" + +#~ msgid "PATTERN ..." +#~ msgstr "PADRÂO..." + +#~ msgid "not serving branch '%s'" +#~ msgstr "ramo '%s' não está sendo servido" + #~ msgid "failed to parse date string '%s': %s" #~ msgstr "erro lendo string de data '%s': %s" ============================================================ --- po/sv.po 0c2a66928b0538cae02268b3fe93de9d70f9c138 +++ po/sv.po 451924b3469f47dce87f8121b6b0132fd164d465 @@ -146,8 +146,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-12 21:50+0100\n" -"PO-Revision-Date: 2006-12-12 21:54+0100\n" +"POT-Creation-Date: 2006-12-15 00:27+0100\n" +"PO-Revision-Date: 2006-12-15 00:30+0100\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -3522,6 +3522,28 @@ msgstr "taggar" msgid "tags" msgstr "taggar" +#: restrictions.cc:60 restrictions.cc:77 +#, c-format +msgid "conflicting include/exclude on path '%s'" +msgstr "motsägelsefulla include och exclude för sökvägen '%s'" + +#: restrictions.cc:103 restrictions.cc:141 +#, c-format +msgid "restriction includes unknown path '%s'" +msgstr "restriktionen har med okänd sökväg '%s'" + +#: restrictions.cc:114 restrictions.cc:155 +#, c-format +msgid "restriction excludes unknown path '%s'" +msgstr "restriktionen utesluter ökänd sökväg '%s'" + +#: restrictions.cc:118 restrictions.cc:159 +#, c-format +msgid "%d unknown path" +msgid_plural "%d unknown paths" +msgstr[0] "%d okänd sökväg" +msgstr[1] "%d okända sökvägar" + #: revision.cc:841 #, c-format msgid "scanning for bogus merge edges" @@ -4342,9 +4364,6 @@ msgstr "denna arbetskopia är i aktuellt #~ "revisionen %s är inte med i nÃ¥gon gren,\n" #~ "använder grenen %s till arbetskopian" -#~ msgid "unknown path '%s'\n" -#~ msgstr "okänd sökväg '%s'\n" - #~ msgid "Unknown file '%s' for log command" #~ msgstr "Okänd fil '%s'"