# # # patch "ChangeLog" # from [400685f99d3035c3a4140fa5ad38d4d9d6bafe8b] # to [f8cae14ded7b353edede456f33fb77047658f9cf] # # patch "po/pt_BR.po" # from [fbe22212f56fc1ac923a20dee66ed01d6a9821f6] # to [1dc820bad14cd5814e3b8f099ae9cf5b22caa119] # ============================================================ --- ChangeLog 400685f99d3035c3a4140fa5ad38d4d9d6bafe8b +++ ChangeLog f8cae14ded7b353edede456f33fb77047658f9cf @@ -1,3 +1,7 @@ +2006-04-23 Alex Queiroz + + * pt_BR.po: Fixed some fuzzy translations. + 2006-04-21 Richard Levitte * contrib/usher.cc (fork_server): Make sure to append to already ============================================================ --- po/pt_BR.po fbe22212f56fc1ac923a20dee66ed01d6a9821f6 +++ po/pt_BR.po 1dc820bad14cd5814e3b8f099ae9cf5b22caa119 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Monotone 0.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-02 19:15-0300\n" -"PO-Revision-Date: 2006-04-02 19:36-0300\n" +"POT-Creation-Date: 2006-04-21 14:46-0300\n" +"PO-Revision-Date: 2006-04-23 19:36-0300\n" "Last-Translator: Alex Sandro Queiroz e Silva \n" "Language-Team: Alex Sandro Queiroz e Silva \n" "MIME-Version: 1.0\n" @@ -16,63 +16,62 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:118 +#: app_state.cc:119 #, c-format msgid "workspace required but not found%s%s" msgstr "área de trabalho necessária mas não encontrada%s%s" -#: app_state.cc:126 +#: app_state.cc:127 #, c-format msgid "invalid directory ''" msgstr "diretório inválido ''" -#: app_state.cc:134 +#: app_state.cc:135 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "" -#: app_state.cc:173 -#: app_state.cc:188 +#: app_state.cc:174 app_state.cc:189 #, c-format msgid "unknown path '%s'\n" msgstr "caminho desconhecido '%s'\n" -#: app_state.cc:349 +#: app_state.cc:350 #, c-format msgid "search root '%s' does not exist" msgstr "raiz de procura '%s' não existe" -#: app_state.cc:350 +#: app_state.cc:351 #, c-format msgid "search root '%s' is not a directory\n" msgstr "raiz de procura '%s' não é um diretório\n" -#: app_state.cc:385 +#: app_state.cc:386 #, c-format msgid "failed to parse date string '%s': %s" msgstr "erro lendo string de data '%s': %s" -#: app_state.cc:399 +#: app_state.cc:400 #, c-format msgid "negative depth not allowed\n" msgstr "profundidade negativa não permitida\n" -#: app_state.cc:407 +#: app_state.cc:408 #, c-format -msgid "negative or zero last not allowed\n" -msgstr "último negativo ou zero não permitido\n" +msgid "illegal argument to --last: cannot be zero or negative\n" +msgstr "" -#: app_state.cc:415 +#: app_state.cc:416 #, c-format -msgid "negative or zero next not allowed\n" -msgstr "próximo negativo ou zero não permitido\n" +msgid "illegal argument to --next: cannot be zero or negative\n" +msgstr "" -#: app_state.cc:544 +#: app_state.cc:552 #, c-format msgid "Failed to read options file %s" msgstr "Impossível ler arquivo de opções %s" -#: app_state.cc:561 +#: app_state.cc:569 #, c-format msgid "Failed to write options file %s" msgstr "Impossível escrever arquivo de opções %s" @@ -95,20 +94,23 @@ #: cert.cc:129 #, c-format msgid "trust function disliked %d signers of %s cert on manifest %s\n" -msgstr "função de confiança rejeitou %d assinantes do certificado %s sobre o manifesto %s\n" +msgstr "" +"função de confiança rejeitou %d assinantes do certificado %s sobre o " +"manifesto %s\n" #: cert.cc:182 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s\n" -msgstr "função de confiança rejeitou %d assinantes do certificado %s sobre a revisão %s\n" +msgstr "" +"função de confiança rejeitou %d assinantes do certificado %s sobre a revisão " +"%s\n" #: cert.cc:271 #, c-format msgid "calculated cert hash '%s' does not match '%s'" msgstr "hash '%s' calculado do certificado não combina com '%s'" -#: cert.cc:347 -#: keys.cc:532 +#: cert.cc:347 keys.cc:532 #, c-format msgid "no key pair '%s' found in key store '%s'" msgstr "nenhum par de chaves '%s' encontrado na coleção '%s'" @@ -129,22 +131,30 @@ "pick one to use for signatures by adding '-k' to your command" msgstr "" "você tem várias chaves privadas\n" -"escolha uma para usar na assinatura adicionando '-k' ao seu comando" +"escolha uma para usar na assinatura adicionando '-k' ao seu " +"comando" #: cert.cc:444 #, c-format msgid "no branch found for empty revision, please provide a branch name" -msgstr "nenhum ramo encontrado para revisão vazia, por favor forneça o nome de um ramo" +msgstr "" +"nenhum ramo encontrado para revisão vazia, por favor forneça o nome de um " +"ramo" #: cert.cc:453 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" -msgstr "nenhum certificado de ramo encontrado para revisão %s, por favor forneça o nome de um ramo" +msgstr "" +"nenhum certificado de ramo encontrado para revisão %s, por favor forneça o " +"nome de um ramo" #: cert.cc:457 #, c-format -msgid "multiple branch certs found for revision %s, please provide a branch name" -msgstr "vários certificados de ramo encontrados para a versão %s, por favor forneça o nome de um ramo" +msgid "" +"multiple branch certs found for revision %s, please provide a branch name" +msgstr "" +"vários certificados de ramo encontrados para a versão %s, por favor forneça " +"o nome de um ramo" #: commands.cc:164 #, c-format @@ -165,27 +175,26 @@ msgid "pid file '%s' already exists" msgstr "arquivo pid '%s' já existe" -#: commands.cc:350 -#: commands.cc:1359 -#: commands.cc:1429 -#: commands.cc:1865 -#: commands.cc:2711 -#: commands.cc:3364 -#: commands.cc:3599 -#: commands.cc:3638 -#: commands.cc:3983 +#: commands.cc:328 +#, c-format +msgid "failed to create pid file '%s'" +msgstr "erro criando arquivo de PID '%s'" + +#: commands.cc:351 commands.cc:1360 commands.cc:1431 commands.cc:1878 +#: commands.cc:2718 commands.cc:3375 commands.cc:3610 commands.cc:3649 +#: commands.cc:4014 msgid "informative" msgstr "informativo" -#: commands.cc:350 +#: commands.cc:351 msgid "command [ARGS...]" msgstr "comando [ARGS...]" -#: commands.cc:350 +#: commands.cc:351 msgid "display command help" msgstr "exibe ajuda de comando" -#: commands.cc:429 +#: commands.cc:430 msgid "" "Enter a description of this change.\n" "Lines beginning with `MTN:' are removed automatically.\n" @@ -193,16 +202,16 @@ "Entre uma descrição para esta mudança.\n" "Linhas que iniciam com `MTN:' serão removidas automaticamente.\n" -#: commands.cc:436 +#: commands.cc:437 #, c-format msgid "edit of log message failed" msgstr "edição de mensagem de registro falhou" -#: commands.cc:445 +#: commands.cc:446 msgid "note: " msgstr "nota: " -#: commands.cc:446 +#: commands.cc:447 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -211,66 +220,59 @@ "ramo '%s' tem múltiplas frentes\n" "considere usar '%s merge'" -#: commands.cc:507 -#: commands.cc:783 -#: commands.cc:1447 -#: commands.cc:1531 -#: commands.cc:2761 -#: commands.cc:2789 -#: commands.cc:2792 -#: commands.cc:2929 -#: commands.cc:3621 +#: commands.cc:508 commands.cc:784 commands.cc:1449 commands.cc:1533 +#: commands.cc:2770 commands.cc:2799 commands.cc:2802 commands.cc:2940 +#: commands.cc:3632 #, c-format msgid "no such revision '%s'" msgstr "versão '%s' não existe" -#: commands.cc:514 +#: commands.cc:515 #, c-format msgid "expanding selection '%s'\n" msgstr "expandindo seleção '%s'\n" -#: commands.cc:522 +#: commands.cc:523 #, c-format msgid "no match for selection '%s'" msgstr "sem equivalente para seleção '%s'" -#: commands.cc:528 +#: commands.cc:529 #, c-format msgid "expanded to '%s'\n" msgstr "expandido para '%s'\n" -#: commands.cc:545 +#: commands.cc:546 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "seleção '%s' tem múltiplas expansões possíveis: \n" -#: commands.cc:563 +#: commands.cc:564 #, c-format msgid "non-hex digits in id" msgstr "dígitos não-hexadecimais em id" -#: commands.cc:572 +#: commands.cc:573 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "id parcial '%s' não tem uma expansão" -#: commands.cc:575 +#: commands.cc:576 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "id parcial '%s' tem múltiplas expansões possíveis:\n" -#: commands.cc:582 +#: commands.cc:583 #, c-format msgid "expanded partial id '%s' to '%s'\n" msgstr "id parcial '%s' expandido para '%s'\n" -#: commands.cc:609 -#: netsync.cc:1749 +#: commands.cc:610 netsync.cc:1749 #, c-format msgid "no public key '%s' found in database" msgstr "chave pública '%s' não encontrada no banco de dados" -#: commands.cc:619 +#: commands.cc:620 #, c-format msgid "" "Key : %s\n" @@ -283,122 +285,122 @@ "Nome : %s\n" "Valor : %s\n" -#: commands.cc:653 +#: commands.cc:654 msgid "ok" msgstr "ok" -#: commands.cc:656 +#: commands.cc:657 msgid "bad" msgstr "ruim" -#: commands.cc:659 +#: commands.cc:660 msgid "unknown" msgstr "desconhecido" -#: commands.cc:746 +#: commands.cc:747 #, c-format msgid "(*) - only in %s/" msgstr "(*) - apenas em %s/" -#: commands.cc:769 +#: commands.cc:770 #, c-format msgid "no keys found\n" msgstr "nenhuma chave encontrada\n" -#: commands.cc:771 +#: commands.cc:772 #, c-format msgid "no keys found matching '%s'\n" msgstr "nenhuma chave de '%s' encontrada\n" -#: commands.cc:789 +#: commands.cc:790 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "versão %s já tem filhos. Não podemos removê-la." -#: commands.cc:929 -#: commands.cc:953 -#: commands.cc:990 -#: commands.cc:1011 -#: commands.cc:1047 +#: commands.cc:930 commands.cc:954 commands.cc:991 commands.cc:1012 +#: commands.cc:1048 msgid "key and cert" msgstr "chave e certificado" -#: commands.cc:929 -#: commands.cc:953 -#: commands.cc:990 +#: commands.cc:930 commands.cc:954 commands.cc:991 msgid "KEYID" msgstr "CHAVEID" -#: commands.cc:929 +#: commands.cc:930 msgid "generate an RSA key-pair" msgstr "gera um par de chaves RSA" -#: commands.cc:944 +#: commands.cc:945 #, c-format msgid "key '%s' already exists" msgstr "chave '%s' já existe" -#: commands.cc:947 +#: commands.cc:948 #, c-format msgid "generating key-pair '%s'" msgstr "gerando par de chaves '%s'" -#: commands.cc:949 +#: commands.cc:950 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "salvando par de chaves '%s' em %s/" -#: commands.cc:953 +#: commands.cc:954 msgid "drop a public and private key" msgstr "remove chaves pública e privada" -#: commands.cc:967 +#: commands.cc:968 #, c-format msgid "dropping public key '%s' from database\n" msgstr "removendo chave pública '%s' do banco de dados\n" -#: commands.cc:977 +#: commands.cc:978 #, c-format msgid "dropping key pair '%s' from keystore\n" msgstr "removendo par de chaves '%s' da coleção\n" -#: commands.cc:984 +#: commands.cc:985 #, c-format msgid "public or private key '%s' does not exist in keystore or database" -msgstr "chave pública ou privada '%s' não existe na coleção nem no banco de dados" +msgstr "" +"chave pública ou privada '%s' não existe na coleção nem no banco de dados" -#: commands.cc:986 +#: commands.cc:987 #, c-format -msgid "public or private key '%s' does not exist in keystore, and no database was specified" -msgstr "chave pública ou privada '%s' não existe na coleção, e nenhum banco de dados foi especificado" +msgid "" +"public or private key '%s' does not exist in keystore, and no database was " +"specified" +msgstr "" +"chave pública ou privada '%s' não existe na coleção, e nenhum banco de dados " +"foi especificado" -#: commands.cc:991 +#: commands.cc:992 msgid "change passphrase of a private RSA key" msgstr "muda frase secreta de uma chave RSA privada" -#: commands.cc:1001 +#: commands.cc:1002 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "chave '%s' não existe na coleção" -#: commands.cc:1008 +#: commands.cc:1009 #, c-format msgid "passphrase changed\n" msgstr "frase secreta mudada\n" -#: commands.cc:1011 +#: commands.cc:1012 msgid "REVISION CERTNAME [CERTVAL]" msgstr "VERSÃO NOME-CERTIFICADO [VALOR-CERTIFICADO]" -#: commands.cc:1012 +#: commands.cc:1013 msgid "create a cert for a revision" msgstr "cria um certificado para uma versão" -#: commands.cc:1047 +#: commands.cc:1048 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "VERSÃO NOME VALOR ASSINANTE1 [ASSINANTE2 [...]]" -#: commands.cc:1048 +#: commands.cc:1049 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -406,7 +408,7 @@ "testa se um certificado hipotético teria confiança\n" "baseado nos parâmetros atuais" -#: commands.cc:1081 +#: commands.cc:1082 #, c-format msgid "" "if a cert on: %s\n" @@ -421,113 +423,99 @@ "fosse assinado por: %s\n" "ele seria: %s\n" -#: commands.cc:1090 +#: commands.cc:1091 msgid "trusted" msgstr "confiável" -#: commands.cc:1090 +#: commands.cc:1091 msgid "UNtrusted" msgstr "NÃO-confiável" -#: commands.cc:1093 -#: commands.cc:1106 -#: commands.cc:1119 -#: commands.cc:1136 -#: commands.cc:1187 +#: commands.cc:1094 commands.cc:1107 commands.cc:1120 commands.cc:1137 +#: commands.cc:1188 msgid "review" msgstr "revisão" -#: commands.cc:1093 +#: commands.cc:1094 msgid "REVISION TAGNAME" msgstr "VERSÃO ETIQUETA" -#: commands.cc:1094 +#: commands.cc:1095 msgid "put a symbolic tag cert on a revision" msgstr "põe um certificado de etiqueta simbólica em uma versão" -#: commands.cc:1106 +#: commands.cc:1107 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: commands.cc:1107 +#: commands.cc:1108 msgid "note the results of running a test on a revision" msgstr "anota os resultados de executar um teste sobre uma versão" -#: commands.cc:1119 -#: commands.cc:1136 +#: commands.cc:1120 commands.cc:1137 msgid "REVISION" msgstr "VERSÂO" -#: commands.cc:1120 +#: commands.cc:1121 msgid "approve of a particular revision" msgstr "aprova a versão especificada" -#: commands.cc:1131 +#: commands.cc:1132 #, c-format msgid "need --branch argument for approval" msgstr "argumento --branch necessário para aprovação" -#: commands.cc:1137 +#: commands.cc:1138 msgid "disapprove of a particular revision" msgstr "desaprova a versão especificada" -#: commands.cc:1150 +#: commands.cc:1151 #, c-format msgid "revision '%s' has %d changesets, cannot invert\n" msgstr "versão '%s' tem %d mudanças, não é possível inverter\n" -#: commands.cc:1154 +#: commands.cc:1155 #, c-format msgid "need --branch argument for disapproval" msgstr "argumento --branch necessário para desaprovação" -#: commands.cc:1187 +#: commands.cc:1188 msgid "REVISION [COMMENT]" msgstr "VERSÃO [COMENTÁRIO]" -#: commands.cc:1188 +#: commands.cc:1189 msgid "comment on a particular revision" msgstr "comenta a versão especificada" -#: commands.cc:1198 +#: commands.cc:1199 #, c-format msgid "edit comment failed" msgstr "edição de comentário falhou" -#: commands.cc:1201 +#: commands.cc:1202 #, c-format msgid "empty comment" msgstr "comentário vazio" -#: commands.cc:1214 -#: commands.cc:1243 -#: commands.cc:1268 -#: commands.cc:1293 -#: commands.cc:2212 -#: commands.cc:2330 -#: commands.cc:2864 -#: commands.cc:3412 +#: commands.cc:1215 commands.cc:1244 commands.cc:1269 commands.cc:1294 +#: commands.cc:2226 commands.cc:2345 commands.cc:2874 commands.cc:3423 msgid "workspace" msgstr "área de trabalho" -#: commands.cc:1214 -#: commands.cc:1243 -#: commands.cc:1359 -#: commands.cc:2330 -#: commands.cc:2711 -#: commands.cc:3412 +#: commands.cc:1215 commands.cc:1244 commands.cc:1360 commands.cc:2345 +#: commands.cc:2718 commands.cc:3423 msgid "[PATH]..." msgstr "[CAMINHO]..." -#: commands.cc:1215 +#: commands.cc:1216 msgid "add files to workspace" msgstr "adiciona arquivos à área de trabalho" -#: commands.cc:1244 +#: commands.cc:1245 msgid "drop files from workspace" msgstr "remove arquivos da área de trabalho" -#: commands.cc:1269 +#: commands.cc:1270 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -535,15 +523,15 @@ "ORIGEM DESTINO\n" "ORIGEM1 [ORIGEM2 [...]] DIRETÓRIO_DESTINO" -#: commands.cc:1271 +#: commands.cc:1272 msgid "rename entries in the workspace" msgstr "renomeia entradas na área de trabalho" -#: commands.cc:1293 +#: commands.cc:1294 msgid "NEW_ROOT PUT_OLD" msgstr "NOVA_RAIZ COLOCAR_O_ANTIGO" -#: commands.cc:1294 +#: commands.cc:1295 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -557,89 +545,78 @@ "COLOCAR_O_ANTIGO.\n" "Usar --execute é altamente recomendado." -#: commands.cc:1313 -#: commands.cc:1326 -#: commands.cc:1406 -#: commands.cc:3519 -#: commands.cc:3964 +#: commands.cc:1314 commands.cc:1327 commands.cc:1408 commands.cc:3530 +#: commands.cc:3995 msgid "debug" msgstr "depuração" -#: commands.cc:1313 +#: commands.cc:1314 msgid "load file contents into db" msgstr "carrega o conteúdo do arquivo no banco de dados" -#: commands.cc:1326 +#: commands.cc:1327 msgid " " msgstr " " -#: commands.cc:1327 +#: commands.cc:1328 msgid "merge 3 files and output result" msgstr "combina 3 arquivos e retorna o resultado" -#: commands.cc:1337 +#: commands.cc:1338 #, c-format msgid "ancestor file id does not exist" msgstr "id do arquivo ancestral não existe" -#: commands.cc:1340 +#: commands.cc:1341 #, c-format msgid "left file id does not exist" msgstr "id do arquivo esquerdo não existe" -#: commands.cc:1343 +#: commands.cc:1344 #, c-format msgid "right file id does not exist" msgstr "id do arquivo direito não existe" -#: commands.cc:1354 +#: commands.cc:1355 #, c-format msgid "merge failed" msgstr "combinação falhou" -#: commands.cc:1359 +#: commands.cc:1360 msgid "show status of workspace" msgstr "mostra status da área de trabalho" -#: commands.cc:1406 +#: commands.cc:1408 msgid "[PATH]" msgstr "[CAMINHO]" -#: commands.cc:1407 +#: commands.cc:1409 msgid "calculate identity of PATH or stdin" msgstr "calcula identidade do CAMINHO ou stdin" -#: commands.cc:1430 +#: commands.cc:1432 msgid "FILENAME" msgstr "ARQUIVO" -#: commands.cc:1431 +#: commands.cc:1433 msgid "write file from database to stdout" msgstr "escreve arquivo do banco de dados em stdout" -#: commands.cc:1459 -#: commands.cc:1461 -#: commands.cc:3630 +#: commands.cc:1461 commands.cc:1463 commands.cc:3641 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "nenhum arquivo '%s' encontrado na versão '%s'\n" -#: commands.cc:1473 -#: commands.cc:1602 -#: commands.cc:3097 -#: commands.cc:3150 -#: commands.cc:3161 -#: commands.cc:3311 -#: commands.cc:3319 -#: commands.cc:3873 +#: commands.cc:1475 commands.cc:1604 commands.cc:3108 commands.cc:3161 +#: commands.cc:3172 commands.cc:3322 commands.cc:3330 commands.cc:3902 msgid "tree" msgstr "árvore" -#: commands.cc:1473 +#: commands.cc:1475 msgid "[DIRECTORY]\n" msgstr "[DIRETÓRIO]\n" -#: commands.cc:1474 +#: commands.cc:1476 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" @@ -652,85 +629,80 @@ "Se nenhum nome de diretório for dado, o nome do ramo será usado como\n" "diretório" -#: commands.cc:1493 -#: commands.cc:1512 +#: commands.cc:1495 commands.cc:1514 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "" -#: commands.cc:1506 +#: commands.cc:1508 #, c-format msgid "checkout directory '%s' already exists" msgstr "" -#: commands.cc:1515 +#: commands.cc:1517 #, c-format msgid "branch '%s' is empty" msgstr "ramo '%s' está vazio" -#: commands.cc:1518 +#: commands.cc:1520 #, c-format msgid "branch %s has multiple heads:" msgstr "ramo %s tem frentes múltiplas:" -#: commands.cc:1521 +#: commands.cc:1523 #, c-format msgid "choose one with '%s checkout -r'" msgstr "escolha um com '%s update -r'" -#: commands.cc:1522 +#: commands.cc:1524 #, c-format msgid "branch %s has multiple heads" msgstr "ramo %s tem frentes múltiplas" -#: commands.cc:1549 +#: commands.cc:1551 #, c-format msgid "revision %s is not a member of branch %s\n" msgstr "versão %s não é um membro do ramo %s\n" -#: commands.cc:1583 +#: commands.cc:1585 #, c-format msgid "no file %s found in database for %s" msgstr "nenhum arquivo %s encontrado no banco de dados para %s" -#: commands.cc:1602 +#: commands.cc:1604 msgid "show unmerged head revisions of branch" msgstr "mostra frentes não combinadas do ramo" -#: commands.cc:1610 -#: commands.cc:3106 +#: commands.cc:1612 commands.cc:3117 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "por favor especifique um ramo com --branch=RAMO" -#: commands.cc:1615 -#: commands.cc:3110 -#: commands.cc:3199 -#: commands.cc:3202 +#: commands.cc:1617 commands.cc:3121 commands.cc:3210 commands.cc:3213 #, c-format msgid "branch '%s' is empty\n" msgstr "ramo '%s' está vazio\n" -#: commands.cc:1617 +#: commands.cc:1619 #, c-format msgid "branch '%s' is currently merged:\n" msgstr "ramo '%s' está atualmente combinado:\n" -#: commands.cc:1619 +#: commands.cc:1621 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "ramo '%s' não está combinado atualmente:\n" -#: commands.cc:1658 +#: commands.cc:1668 #, c-format msgid "no epoch for branch %s\n" msgstr "nenhuma era para ramo %s\n" -#: commands.cc:1866 +#: commands.cc:1879 msgid "" "certs ID\n" "keys [PATTERN]\n" -"branches\n" +"branches [PATTERN]\n" "epochs [BRANCH [...]]\n" "tags\n" "vars [DOMAIN]\n" @@ -742,7 +714,7 @@ msgstr "" "certs ID\n" "keys [PADRÃO]\n" -"branches\n" +"branches [PADRÃO]\n" "epochs [RAMO [...]]\n" "tags\n" "vars [DOMÍNIO]\n" @@ -752,150 +724,148 @@ "missing\n" "changed" -#: commands.cc:1877 +#: commands.cc:1890 msgid "" "show database objects, or the current workspace manifest, or known,\n" "unknown, intentionally ignored, missing, or changed state files" msgstr "" -"exibe objetos do banc de dados, ou a listagem da área de trabalho atual,\n" +"exibe objetos do banco de dados, ou a listagem da área de trabalho atual,\n" "ou arquivos conhecidos, desconhecidos, intencionalmente ignorados,\n" "faltando ou que mudaram de estado" -#: commands.cc:1915 -#: commands.cc:1943 -#: commands.cc:1961 +#: commands.cc:1928 commands.cc:1956 commands.cc:1974 msgid "packet i/o" msgstr "E/S de pacotes" -#: commands.cc:1915 -#: commands.cc:1943 +#: commands.cc:1928 commands.cc:1956 msgid "ID" msgstr "ID" -#: commands.cc:1915 +#: commands.cc:1928 msgid "write public key packet to stdout" msgstr "escreve pacote de chave pública em stdout" -#: commands.cc:1937 +#: commands.cc:1950 #, c-format msgid "public key '%s' does not exist" msgstr "chave pública '%s' não existe" -#: commands.cc:1943 +#: commands.cc:1956 msgid "write private key packet to stdout" msgstr "escreve pacote de chave privada em stdout" -#: commands.cc:1951 +#: commands.cc:1964 #, c-format msgid "public and private key '%s' do not exist in keystore" msgstr "chaves pública e privada '%s' não existem na coleção" -#: commands.cc:1962 +#: commands.cc:1975 msgid "read packets from files or stdin" msgstr "lê pacotes de arquivos ou de stdin" -#: commands.cc:1970 +#: commands.cc:1983 #, c-format msgid "no packets found on stdin" msgstr "nenhum pacote encontrado em stdin" -#: commands.cc:1981 +#: commands.cc:1994 #, c-format msgid "no packets found in given file" msgid_plural "no packets found in given files" msgstr[0] "nenhum pacote encontrado no arquivo dado" msgstr[1] "nenhum pacote encontrado nos arquivos dados" -#: commands.cc:1985 +#: commands.cc:1998 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "lido %d pacote" msgstr[1] "lidos %d pacotes" -#: commands.cc:2014 +#: commands.cc:2027 #, c-format msgid "setting default server to %s\n" msgstr "configurando servidor padrão para %s\n" -#: commands.cc:2020 +#: commands.cc:2033 #, c-format msgid "no hostname given" msgstr "nenhum nome de host dado" -#: commands.cc:2022 +#: commands.cc:2035 #, c-format msgid "no server given and no default server set" msgstr "nenhum servidor dado e nenhum servidor padrão configurado" -#: commands.cc:2040 +#: commands.cc:2046 commands.cc:2066 #, c-format +msgid "no branch pattern given" +msgstr "nenhum padrão de ramos dado" + +#: commands.cc:2054 +#, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "configurando padrão de inclusão de ramos para '%s'\n" -#: commands.cc:2046 +#: commands.cc:2060 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "configurando padrão de exclusão de ramos para '%s'\n" -#: commands.cc:2052 +#: commands.cc:2068 #, c-format -msgid "no branch pattern given" -msgstr "nenhum padrão de ramos dado" - -#: commands.cc:2054 -#, c-format msgid "no branch pattern given and no default pattern set" msgstr "nenhum padrão de ramo dado e nenhum configurado" -#: commands.cc:2070 -#: commands.cc:2085 -#: commands.cc:2099 -#: commands.cc:2114 +#: commands.cc:2084 commands.cc:2099 commands.cc:2113 commands.cc:2128 msgid "network" msgstr "rede" -#: commands.cc:2070 -#: commands.cc:2085 -#: commands.cc:2099 +#: commands.cc:2084 commands.cc:2099 commands.cc:2113 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ENDEREÇO[:PORTA] [PADRÃO]]" -#: commands.cc:2071 +#: commands.cc:2085 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "envia ramos que combinam com PADRÃO para servidor netsync em ENDEREÇO" -#: commands.cc:2086 +#: commands.cc:2100 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "recebe ramos que combinam com PADRÃO do servidor netsync em ENDEREÇO" -#: commands.cc:2093 +#: commands.cc:2107 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n" -msgstr "recebendo dados anonimamente; user -kNOMEDACHAVE se for necessária autenticação\n" +msgstr "" +"recebendo dados anonimamente; user -kNOMEDACHAVE se for necessária " +"autenticação\n" -#: commands.cc:2100 +#: commands.cc:2114 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" +msgstr "" +"sincroniza ramos que combinam com PADRÃO com o servidor netsync em ENDEREÇO" -#: commands.cc:2114 +#: commands.cc:2128 msgid "PATTERN ..." msgstr "PADRÂO..." -#: commands.cc:2115 +#: commands.cc:2129 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "serve os ramos especificados por PADRÂO para clientes" -#: commands.cc:2128 +#: commands.cc:2142 #, c-format -msgid "need permission to store persistent passphrase (see hook persist_phrase_ok())" -msgstr "é necessária permissão para salvar frase-passe persistentemente (veja gancho persist_phrase_ok())" +msgid "" +"need permission to store persistent passphrase (see hook persist_phrase_ok())" +msgstr "" +"é necessária permissão para salvar frase-passe persistentemente (veja gancho " +"persist_phrase_ok())" -#: commands.cc:2140 +#: commands.cc:2154 msgid "database" msgstr "banco de dados" -#: commands.cc:2141 +#: commands.cc:2155 msgid "" "init\n" "info\n" @@ -927,16 +897,16 @@ "rosterify\n" "set_epoch RAMO ERA\n" -#: commands.cc:2155 +#: commands.cc:2169 msgid "manipulate database state" msgstr "manipula estado do bando de dados" -#: commands.cc:2202 +#: commands.cc:2216 #, c-format msgid "The epoch must be %s characters" msgstr "A era deve ter %s caracteres" -#: commands.cc:2212 +#: commands.cc:2226 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -946,88 +916,92 @@ "get CAMINHO [ATRIBUTO]\n" "drop CAMINHO [ATRIBUTO]" -#: commands.cc:2213 +#: commands.cc:2227 msgid "set, get or drop file attributes" msgstr "configura, lê ou descarta atributos de arquivos" -#: commands.cc:2229 +#: commands.cc:2244 #, c-format msgid "Unknown path '%s'" msgstr "caminho desconhecido '%s'" -#: commands.cc:2258 +#: commands.cc:2273 #, c-format msgid "Path '%s' does not have attribute '%s'\n" msgstr "caminho '%s' não tem atributo '%s'\n" -#: commands.cc:2284 +#: commands.cc:2299 #, c-format msgid "No attributes for '%s'" msgstr "Nenhum atributo para '%s'" -#: commands.cc:2293 +#: commands.cc:2308 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Nenhum atributo '%s' no caminho '%s'" -#: commands.cc:2312 +#: commands.cc:2327 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message e --message-file são mutuamente exclusivos" -#: commands.cc:2331 +#: commands.cc:2346 msgid "commit workspace to database" msgstr "grava mudanças da área de trabalho no banco de dados" -#: commands.cc:2349 +#: commands.cc:2365 #, c-format msgid "no changes to commit\n" msgstr "nenhuma mudança para gravar\n" -#: commands.cc:2363 +#: commands.cc:2379 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "iniciando gravação do ramo '%s'\n" -#: commands.cc:2372 +#: commands.cc:2388 #, 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 não está vazio e uma mensagem de registro foi dada na linha de comando\n" +"_MTN/log não está vazio e uma mensagem de registro foi dada na linha de " +"comando\n" "considere mover ou apagar _MTN/log,\n" "ou remova --message/--message-from-file da linha de comando" -#: commands.cc:2384 +#: commands.cc:2400 #, c-format msgid "empty log message; commit canceled" msgstr "mensagem de registro vazia, gravação cancelada" -#: commands.cc:2403 +#: commands.cc:2419 #, c-format msgid "log message rejected: %s\n" msgstr "mensagem de registro rejeitada: %s\n" -#: commands.cc:2411 +#: commands.cc:2427 #, c-format msgid "revision %s already in database\n" msgstr "versão %s já está no banco de dados\n" -#: commands.cc:2449 -#: commands.cc:2466 -#: commands.cc:2485 +#: commands.cc:2465 commands.cc:2492 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "arquivo '%s' modificado durante gravação, abortando" -#: commands.cc:2511 +#: commands.cc:2475 #, c-format +msgid "Your database is missing version %s of file '%s'" +msgstr "" + +#: commands.cc:2518 +#, c-format msgid "committed revision %s\n" msgstr "versão %s gravada\n" -#: commands.cc:2517 +#: commands.cc:2524 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1036,7 +1010,7 @@ "nota: esta versão cria divergência\n" "nota: talvez você queira executar '%s merge'" -#: commands.cc:2712 +#: commands.cc:2719 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -1049,7 +1023,7 @@ "elas é exibida. Se nenhum formato for especificado. o unificado é\n" "usado por padrão." -#: commands.cc:2728 +#: commands.cc:2736 #, c-format msgid "" "--diff-args requires --external\n" @@ -1058,16 +1032,16 @@ "--diff-args requer --external\n" "adicione --external ou remova --diff-args" -#: commands.cc:2770 +#: commands.cc:2780 #, c-format msgid "current revision has no ancestor" msgstr "versão atual não tem ancestral" -#: commands.cc:2833 +#: commands.cc:2843 msgid "no changes" msgstr "sem mudanças" -#: commands.cc:2865 +#: commands.cc:2875 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -1076,17 +1050,17 @@ "If not, update the workspace to the head of the branch." msgstr "" -#: commands.cc:2903 +#: commands.cc:2914 #, c-format msgid "this workspace is a new project; cannot update" msgstr "esta área de trabalho é um novo projeto; impossível atualizar" -#: commands.cc:2907 +#: commands.cc:2918 #, c-format -msgid "updating along branch '%s'..." -msgstr "atualizando segundo ramo '%s'..." +msgid "updating along branch '%s'" +msgstr "atualizando segundo ramo '%s'" -#: commands.cc:2911 +#: commands.cc:2922 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1094,32 +1068,32 @@ "maybe you want --revision=" msgstr "" -#: commands.cc:2916 +#: commands.cc:2927 #, c-format msgid "multiple update candidates:" msgstr "múltiplos candidatos para atualização:" -#: commands.cc:2920 +#: commands.cc:2931 #, c-format msgid "choose one with '%s update -r'" msgstr "escolha um com '%s update -r'" -#: commands.cc:2921 +#: commands.cc:2932 #, c-format msgid "multiple update candidates remain after selection" msgstr "ainda há múltiplos candidatos para atualização após seleção" -#: commands.cc:2936 +#: commands.cc:2947 #, c-format msgid "already up to date at %s\n" msgstr "já atualizado em %s\n" -#: commands.cc:2944 +#: commands.cc:2955 #, c-format msgid "selected update target %s\n" msgstr "selecionado alvo %s para atualização\n" -#: commands.cc:2974 +#: commands.cc:2985 #, c-format msgid "" "revision %s is a member of multiple branches:\n" @@ -1131,7 +1105,7 @@ "%s\n" "tente de novo com --branch" -#: commands.cc:2980 +#: commands.cc:2991 #, c-format msgid "" "revision %s is a member of\n" @@ -1140,7 +1114,7 @@ "versão %s é um membro de\n" "%s, atualizando ramo da área de trabalho" -#: commands.cc:2986 +#: commands.cc:2997 #, c-format msgid "" "revision %s is a member of no branches,\n" @@ -1149,200 +1123,196 @@ "versão %s não é membro de algum ramo,\n" "usando ramo %s para área de trabalho" -#: commands.cc:3087 +#: commands.cc:3098 #, c-format msgid "updated to base revision %s\n" msgstr "atualizado para versão-base %s\n" -#: commands.cc:3097 +#: commands.cc:3108 msgid "merge unmerged heads of branch" msgstr "combina diferentes frentes do ramo" -#: commands.cc:3113 +#: commands.cc:3124 #, c-format msgid "branch '%s' is already merged\n" msgstr "ramo '%s' já está combinado\n" -#: commands.cc:3121 +#: commands.cc:3132 #, c-format msgid "starting with revision 1 / %d\n" msgstr "iniciando com versão 1 / %d\n" -#: commands.cc:3125 +#: commands.cc:3136 #, c-format msgid "merging with revision %d / %d\n" msgstr "combinando com versão %d / %d\n" -#: commands.cc:3126 -#: commands.cc:3127 -#: commands.cc:3209 -#: commands.cc:3342 -#: commands.cc:3343 +#: commands.cc:3137 commands.cc:3138 commands.cc:3220 commands.cc:3353 +#: commands.cc:3354 #, c-format msgid "[source] %s\n" msgstr "[fonte] %s\n" -#: commands.cc:3144 -#: commands.cc:3307 -#: commands.cc:3361 +#: commands.cc:3155 commands.cc:3318 commands.cc:3372 #, c-format msgid "[merged] %s\n" msgstr "[combinado] %s\n" -#: commands.cc:3147 +#: commands.cc:3158 #, c-format msgid "note: your workspaces have not been updated\n" msgstr "nota: suas áreas de trabalho não foram atualizadas\n" -#: commands.cc:3150 +#: commands.cc:3161 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "RAMO-FONTE RAMO-DESTINO" -#: commands.cc:3151 +#: commands.cc:3162 msgid "merge from one branch to another asymmetrically" msgstr "combina dois ramos de forma assimétrica" -#: commands.cc:3161 +#: commands.cc:3172 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "RAMO-FONTE RAMO-DESTINO DIRETÓRIO" -#: commands.cc:3162 +#: commands.cc:3173 msgid "merge one branch into a subdirectory in another branch" msgstr "combina um ramo com um sibdiretório de outro ramo" -#: commands.cc:3200 -#: commands.cc:3203 +#: commands.cc:3211 commands.cc:3214 #, c-format msgid "branch '%s' is not merged\n" msgstr "ramo '%s' não está combinado\n" -#: commands.cc:3208 +#: commands.cc:3219 #, c-format msgid "propagating %s -> %s\n" msgstr "propagando %s -> %s\n" -#: commands.cc:3210 +#: commands.cc:3221 #, c-format msgid "[target] %s\n" msgstr "[alvo] %s\n" -#: commands.cc:3215 +#: commands.cc:3226 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "ramo '%s' está atualizado em relação ao ramo '%s'\n" -#: commands.cc:3217 +#: commands.cc:3228 #, c-format msgid "no action taken\n" msgstr "nenhuma ação tomada\n" -#: commands.cc:3221 +#: commands.cc:3232 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "não há necessidade de combinação; colocando %s no ramo '%s'\n" -#: commands.cc:3257 +#: commands.cc:3268 #, c-format msgid "Path %s not found in destination tree." msgstr "Caminho %s não foi encontrado na árvore de destino." -#: commands.cc:3311 +#: commands.cc:3322 msgid "refresh the inodeprint cache" msgstr "atualiza o cache de inodeprint" -#: commands.cc:3320 +#: commands.cc:3331 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VERSÃO-ESQUERDA VERSÃO-DIREITA RAMO-DESTINO" -#: commands.cc:3321 +#: commands.cc:3332 msgid "merge two explicitly given revisions, placing result in given branch" -msgstr "combina duas versões dadas explicitamente colocando o resuldado no ramo dado" +msgstr "" +"combina duas versões dadas explicitamente colocando o resuldado no ramo dado" -#: commands.cc:3335 +#: commands.cc:3346 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s e %s são a mesma versão, abortando" -#: commands.cc:3337 -#: commands.cc:3339 +#: commands.cc:3348 commands.cc:3350 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s já é um ancestral de %s" -#: commands.cc:3364 +#: commands.cc:3375 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) ID-PARCIAL" -#: commands.cc:3365 +#: commands.cc:3376 msgid "complete partial id" msgstr "id parcial completo" -#: commands.cc:3374 +#: commands.cc:3385 #, c-format msgid "non-hex digits in partial id" msgstr "dígitos não-hexadecimais no id parcial" -#: commands.cc:3413 +#: commands.cc:3424 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "reverte arquivo(s), diretório(s) ou a área de trabalho inteira (\".\")" -#: commands.cc:3490 +#: commands.cc:3501 #, c-format msgid "reverting %s" msgstr "revertendo %s" -#: commands.cc:3494 +#: commands.cc:3505 #, c-format msgid "no file version %s found in database for %s" msgstr "nenhuma versão %s do arquivo achada no banco de dados para %s" -#: commands.cc:3507 +#: commands.cc:3518 #, c-format msgid "recreating %s/" msgstr "recriando %s/" -#: commands.cc:3519 +#: commands.cc:3530 msgid "RCSFILE..." msgstr "ARQUIVO-RCS" -#: commands.cc:3520 +#: commands.cc:3531 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 "" "identifica versões em arquivos RCS\n" -"este comando não reconstrui ou importa versões. Você provavelmente quer cvs_import" +"este comando não reconstrui ou importa versões. Você provavelmente quer " +"cvs_import" -#: commands.cc:3536 +#: commands.cc:3547 msgid "rcs" msgstr "rcs" -#: commands.cc:3536 +#: commands.cc:3547 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3536 +#: commands.cc:3547 msgid "import all versions in CVS repository" msgstr "importa todas as versões do repositório CVS" -#: commands.cc:3599 +#: commands.cc:3610 msgid "PATH" msgstr "CAMINHO" -#: commands.cc:3600 +#: commands.cc:3611 msgid "print annotated copy of the file from REVISION" msgstr "imprime cópia anotada do arquivo da VERSÃO" -#: commands.cc:3620 +#: commands.cc:3631 #, c-format msgid "no revision for file '%s' in database" msgstr "nenhuma versão '%s' do arquivo em banco de dados" -#: commands.cc:3638 +#: commands.cc:3649 msgid "[FILE] ..." msgstr "[ARQUIVO] ..." -#: commands.cc:3639 +#: commands.cc:3650 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1350,34 +1320,34 @@ "imprime histórico em ordem inversa (filtrado por 'ARQUIVO'). Se uma ou\n" "mais versões forem dadas, usa-as como ponto de partida." -#: commands.cc:3687 +#: commands.cc:3701 #, c-format msgid "Unknown file '%s' for log command" msgstr "Arquivo '%s' desconhecido para comando log" -#: commands.cc:3705 +#: commands.cc:3734 #, c-format msgid "only one of --last/--next allowed" msgstr "apenas ou --last ou --next é permitido" -#: commands.cc:3873 +#: commands.cc:3902 msgid "[DIRECTORY]" msgstr "[DIRETÓRIO]" -#: commands.cc:3873 +#: commands.cc:3902 msgid "setup a new workspace directory, default to current" msgstr "configura um novo diretório como área de trabalho, o padrão é o atual" -#: commands.cc:3879 +#: commands.cc:3908 #, c-format msgid "need --branch argument for setup" msgstr "argumento --branch é necessário para configuração" -#: commands.cc:3893 +#: commands.cc:3922 msgid "automation" msgstr "automação" -#: commands.cc:3894 +#: commands.cc:3923 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1429,84 +1399,84 @@ "packet_for_fdelta ARQUIVO_VELHO ARQUIVO_NOVO\n" "keys\n" -#: commands.cc:3918 +#: commands.cc:3947 msgid "automation interface" msgstr "interface de automação" -#: commands.cc:3932 -#: commands.cc:3948 +#: commands.cc:3963 commands.cc:3979 msgid "vars" msgstr "variáveis" -#: commands.cc:3932 +#: commands.cc:3963 msgid "DOMAIN NAME VALUE" msgstr "DOMÍNIO NOME VALOR" -#: commands.cc:3933 +#: commands.cc:3964 msgid "set the database variable NAME to VALUE, in domain DOMAIN" -msgstr "configura a variável do banco de dados NOME para VALOR, no domínio DOMÍNIO" +msgstr "" +"configura a variável do banco de dados NOME para VALOR, no domínio DOMÍNIO" -#: commands.cc:3948 +#: commands.cc:3979 msgid "DOMAIN NAME" msgstr "DOMÍNIO NOME" -#: commands.cc:3949 +#: commands.cc:3980 msgid "remove the database variable NAME in domain DOMAIN" msgstr "remove a variável do banco de dados NOME no domínio DOMAIN" -#: commands.cc:3960 +#: commands.cc:3991 #, c-format msgid "no var with name %s in domain %s" msgstr "nenhuma variável com nome %s no domínio %s" -#: commands.cc:3964 +#: commands.cc:3995 msgid "REVID" msgstr "VERSÂO" -#: commands.cc:3965 +#: commands.cc:3996 msgid "dump the roster associated with the given REVID" msgstr "exibe conteúdo do roster associado com VERSÃO" -#: commands.cc:3983 +#: commands.cc:4014 msgid "REV REV" msgstr "VERSÂO VERSÂO" -#: commands.cc:3983 -msgid "Show what conflicts would need to be resolved to merge the given revisions." +#: commands.cc:4014 +msgid "" +"Show what conflicts would need to be resolved to merge the given revisions." msgstr "" -#: commands.cc:3992 -#: commands.cc:3994 +#: commands.cc:4023 commands.cc:4025 #, c-format -msgid "%s in an ancestor of %s; no merge is needed." -msgstr "%s e um ancestral de %s; nenhuma combinação é necessária." +msgid "%s is an ancestor of %s; no merge is needed." +msgstr "%s é um ancestral de %s; nenhuma combinação é necessária." -#: commands.cc:4008 +#: commands.cc:4039 #, c-format msgid "There are %s node_name_conflicts." msgstr "" -#: commands.cc:4009 +#: commands.cc:4040 #, c-format msgid "There are %s file_content_conflicts." msgstr "" -#: commands.cc:4010 +#: commands.cc:4041 #, c-format msgid "There are %s node_attr_conflicts." msgstr "" -#: commands.cc:4011 +#: commands.cc:4042 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "" -#: commands.cc:4012 +#: commands.cc:4043 #, c-format msgid "There are %s rename_target_conflicts." msgstr "" -#: commands.cc:4013 +#: commands.cc:4044 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "" @@ -1523,10 +1493,7 @@ msgid "markings" msgstr "marcas" -#: database_check.cc:319 -#: database_check.cc:507 -#: netsync.cc:2782 -#: rcs_import.cc:1226 +#: database_check.cc:319 netsync.cc:2797 rcs_import.cc:1226 msgid "revisions" msgstr "versões" @@ -1534,8 +1501,7 @@ msgid "ancestry" msgstr "descendência" -#: database_check.cc:451 -#: netsync.cc:2786 +#: database_check.cc:451 netsync.cc:2801 msgid "keys" msgstr "chaves" @@ -1543,247 +1509,250 @@ msgid "certs" msgstr "certificados" -#: database_check.cc:543 +#: database_check.cc:514 #, c-format msgid "file %s missing (%d manifest references)\n" msgstr "arquivo %s faltando (%d referências no manifesto)\n" -#: database_check.cc:550 +#: database_check.cc:521 #, c-format msgid "file %s unreferenced\n" msgstr "arquivo %s não referenciado\n" -#: database_check.cc:571 +#: database_check.cc:542 #, c-format msgid "roster %s unreferenced\n" msgstr "inventório %s não referenciado\n" -#: database_check.cc:577 +#: database_check.cc:548 #, c-format msgid "roster %s incomplete (%d missing files)\n" msgstr "inventório %s está incompleto (%d arquivos faltando)\n" -#: database_check.cc:584 +#: database_check.cc:555 #, c-format msgid "roster %s incomplete (%d missing revisions)\n" msgstr "inventório %s está incompleto (%d versões faltando)\n" -#: database_check.cc:591 +#: database_check.cc:562 #, c-format msgid "roster %s is not parseable (perhaps with unnormalized paths?)\n" msgstr "inventório %s está ilegível (talvez com caminhos não normalizados?)\n" -#: database_check.cc:598 +#: database_check.cc:569 #, c-format msgid "roster %s is not in normalized form\n" msgstr "inventório %s não está normalizado\n" -#: database_check.cc:623 +#: database_check.cc:594 #, c-format -msgid "revision %s missing (%d revision references; %d cert references; %d parent references; %d child references; %d roster references)\n" +msgid "" +"revision %s missing (%d revision references; %d cert references; %d parent " +"references; %d child references; %d roster references)\n" msgstr "" -#: database_check.cc:631 +#: database_check.cc:602 #, c-format msgid "revision %s incomplete (%d missing manifests)\n" msgstr "versão %s está incompleta (%d listagens faltando)\n" -#: database_check.cc:638 +#: database_check.cc:609 #, c-format msgid "revision %s incomplete (%d missing revisions)\n" msgstr "versão %s está incompleta (%d versões faltando)\n" -#: database_check.cc:645 +#: database_check.cc:616 #, c-format msgid "revision %s incomplete (missing roster link)\n" msgstr "" -#: database_check.cc:651 +#: database_check.cc:622 #, c-format msgid "revision %s incomplete (missing roster)\n" msgstr "" -#: database_check.cc:657 +#: database_check.cc:628 #, c-format msgid "revision %s mismatched roster and manifest\n" msgstr "" -#: database_check.cc:663 +#: database_check.cc:634 #, c-format msgid "revision %s incomplete (incomplete roster)\n" msgstr "" -#: database_check.cc:669 +#: database_check.cc:640 #, c-format -msgid "revision %s mismatched parents (%d ancestry parents; %d revision refs)\n" +msgid "" +"revision %s mismatched parents (%d ancestry parents; %d revision refs)\n" msgstr "" -#: database_check.cc:678 +#: database_check.cc:649 #, c-format msgid "revision %s mismatched children (%d ancestry children; %d parents)\n" msgstr "" -#: database_check.cc:690 +#: database_check.cc:661 #, c-format msgid "revision %s has bad history (%s)\n" msgstr "versão %s tem um histórico ruim (%s)\n" -#: database_check.cc:697 +#: database_check.cc:668 #, c-format msgid "revision %s is not parseable (perhaps with unnormalized paths?)\n" msgstr "" -#: database_check.cc:704 +#: database_check.cc:675 #, c-format msgid "revision %s is not in normalized form\n" msgstr "" -#: database_check.cc:728 +#: database_check.cc:699 #, c-format msgid "key %s missing (signed %d certs)\n" msgstr "" -#: database_check.cc:761 +#: database_check.cc:732 #, c-format msgid "revision %s unchecked signature in %s cert from missing key %s\n" msgstr "" -#: database_check.cc:769 +#: database_check.cc:740 #, c-format msgid "revision %s bad signature in %s cert from key %s\n" msgstr "" -#: database_check.cc:784 +#: database_check.cc:755 #, c-format msgid "revision %s missing %s cert\n" msgstr "" -#: database_check.cc:793 +#: database_check.cc:764 #, c-format msgid "revision %s mismatched certs (%d authors %d dates %d changelogs)\n" msgstr "" -#: database_check.cc:874 +#: database_check.cc:850 #, c-format msgid "%d missing files\n" msgstr "" -#: database_check.cc:876 +#: database_check.cc:852 #, c-format msgid "%d unreferenced files\n" msgstr "" -#: database_check.cc:879 +#: database_check.cc:855 #, c-format msgid "%d unreferenced rosters\n" msgstr "" -#: database_check.cc:881 +#: database_check.cc:857 #, c-format msgid "%d incomplete rosters\n" msgstr "" -#: database_check.cc:883 +#: database_check.cc:859 #, c-format msgid "%d rosters not parseable (perhaps with invalid paths)\n" msgstr "" -#: database_check.cc:886 +#: database_check.cc:862 #, c-format msgid "%d rosters not in normalized form\n" msgstr "" -#: database_check.cc:889 +#: database_check.cc:865 #, c-format msgid "%d missing revisions\n" msgstr "" -#: database_check.cc:891 +#: database_check.cc:867 #, c-format msgid "%d incomplete revisions\n" msgstr "" -#: database_check.cc:893 +#: database_check.cc:869 #, c-format msgid "%d mismatched parents\n" msgstr "" -#: database_check.cc:895 +#: database_check.cc:871 #, c-format msgid "%d mismatched children\n" msgstr "" -#: database_check.cc:897 +#: database_check.cc:873 #, c-format msgid "%d revisions with bad history\n" msgstr "" -#: database_check.cc:899 +#: database_check.cc:875 #, c-format msgid "%d revisions not parseable (perhaps with invalid paths)\n" msgstr "" -#: database_check.cc:902 +#: database_check.cc:878 #, c-format msgid "%d revisions not in normalized form\n" msgstr "" -#: database_check.cc:906 +#: database_check.cc:882 #, c-format msgid "%d unreferenced roster links\n" msgstr "" -#: database_check.cc:909 +#: database_check.cc:885 #, c-format msgid "%d missing rosters\n" msgstr "" -#: database_check.cc:913 +#: database_check.cc:889 #, c-format msgid "%d missing keys\n" msgstr "" -#: database_check.cc:916 +#: database_check.cc:892 #, c-format msgid "%d missing certs\n" msgstr "" -#: database_check.cc:918 +#: database_check.cc:894 #, c-format msgid "%d mismatched certs\n" msgstr "" -#: database_check.cc:920 +#: database_check.cc:896 #, c-format msgid "%d unchecked signatures due to missing keys\n" msgstr "" -#: database_check.cc:922 +#: database_check.cc:898 #, c-format msgid "%d bad signatures\n" msgstr "" -#: database_check.cc:948 +#: database_check.cc:924 #, c-format msgid "check complete: %d files; %d rosters; %d revisions; %d keys; %d certs\n" msgstr "" -#: database_check.cc:954 +#: database_check.cc:930 #, c-format msgid "total problems detected: %d (%d serious)\n" msgstr "" -#: database_check.cc:956 +#: database_check.cc:932 #, c-format msgid "serious problems detected" msgstr "" -#: database_check.cc:958 +#: database_check.cc:934 #, c-format msgid "minor problems detected\n" msgstr "" -#: database_check.cc:960 +#: database_check.cc:936 #, c-format msgid "database is good\n" msgstr "" @@ -1832,15 +1801,13 @@ msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" -#: database.cc:266 -#: schema_migration.cc:187 +#: database.cc:266 schema_migration.cc:187 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" msgstr "" -#: database.cc:272 -#: schema_migration.cc:192 +#: database.cc:272 schema_migration.cc:192 #, c-format msgid "" "sqlite error: %s\n" @@ -1855,16 +1822,17 @@ #: database.cc:323 #, c-format msgid "" -"existing (possibly stale) journal file '%s' has same stem as new database '%s'\n" +"existing (possibly stale) journal file '%s' has same stem as new database '%" +"s'\n" "cancelling database creation" msgstr "" -#: database.cc:466 +#: database.cc:473 #, c-format msgid "cannot create %s; it already exists" msgstr "" -#: database.cc:530 +#: database.cc:537 #, c-format msgid "" "schema version : %s\n" @@ -1890,52 +1858,52 @@ " cache size : %u\n" msgstr "" -#: database.cc:590 +#: database.cc:597 #, c-format msgid "database schema version: %s" msgstr "" -#: database.cc:667 +#: database.cc:674 #, c-format msgid "multiple statements in query: %s\n" msgstr "" -#: database.cc:673 +#: database.cc:680 #, c-format msgid "wanted %d columns got %d in query: %s\n" msgstr "" -#: database.cc:732 +#: database.cc:739 #, c-format msgid "null result in query: %s\n" msgstr "" -#: database.cc:750 +#: database.cc:757 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "" -#: database.cc:1770 +#: database.cc:1777 #, c-format msgid "another key with name '%s' already exists" msgstr "" -#: database.cc:2826 +#: database.cc:2833 #, c-format msgid "no database specified" msgstr "" -#: database.cc:2834 +#: database.cc:2841 #, c-format msgid "database %s does not exist" msgstr "" -#: database.cc:2835 +#: database.cc:2842 #, c-format msgid "%s is a directory, not a database" msgstr "" -#: database.cc:2860 +#: database.cc:2867 #, c-format msgid "could not open database '%s': %s" msgstr "" @@ -1970,8 +1938,7 @@ msgid "expected file '%s', but it is a directory." msgstr "" -#: file_io.cc:186 -#: file_io.cc:193 +#: file_io.cc:186 file_io.cc:193 #, c-format msgid "" "could not create directory '%s'\n" @@ -2047,8 +2014,7 @@ msgid "rename source file '%s' is a directory -- bug in monotone?" msgstr "" -#: file_io.cc:268 -#: file_io.cc:281 +#: file_io.cc:268 file_io.cc:281 #, c-format msgid "rename target '%s' already exists" msgstr "" @@ -2128,8 +2094,7 @@ msgid "empty passphrases not allowed, try again\n" msgstr "" -#: keys.cc:106 -#: keys.cc:113 +#: keys.cc:106 keys.cc:113 #, c-format msgid "too many failed passphrases\n" msgstr "" @@ -2149,9 +2114,7 @@ msgid "passphrase for '%s' is incorrect" msgstr "" -#: lua.cc:539 -#: lua.cc:568 -#: lua.cc:583 +#: lua.cc:539 lua.cc:568 lua.cc:583 #, c-format msgid "%s called with an invalid parameter" msgstr "" @@ -2161,15 +2124,12 @@ msgid "Directory '%s' does not exists" msgstr "" -#: lua.cc:587 -#: rcs_import.cc:1217 -#: work.cc:420 +#: lua.cc:587 rcs_import.cc:1217 work.cc:420 #, c-format msgid "'%s' is not a directory" msgstr "" -#: lua.cc:606 -#: lua.cc:908 +#: lua.cc:606 lua.cc:908 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "" @@ -2207,229 +2167,233 @@ msgid "mismatched node hash value %s, expected %s" msgstr "" -#: monotone.cc:51 +#: monotone.cc:54 msgid "select branch cert for operation" msgstr "" -#: monotone.cc:52 +#: monotone.cc:55 msgid "select revision id for operation" msgstr "" -#: monotone.cc:53 +#: monotone.cc:56 msgid "set commit changelog message" msgstr "" -#: monotone.cc:54 +#: monotone.cc:57 msgid "set filename containing commit changelog message" msgstr "" -#: monotone.cc:55 +#: monotone.cc:58 msgid "override date/time for commit" msgstr "" -#: monotone.cc:56 +#: monotone.cc:59 msgid "override author for commit" msgstr "" -#: monotone.cc:57 +#: monotone.cc:60 msgid "limit the number of levels of directories to descend" msgstr "" -#: monotone.cc:58 +#: monotone.cc:61 msgid "limit log output to the last number of entries" msgstr "" -#: monotone.cc:59 +#: monotone.cc:62 msgid "limit log output to the next number of entries" msgstr "" -#: monotone.cc:60 +#: monotone.cc:63 msgid "record process id of server" msgstr "" -#: monotone.cc:61 +#: monotone.cc:64 msgid "print a brief version of the normal output" msgstr "" -#: monotone.cc:62 +#: monotone.cc:65 msgid "print diffs along with logs" msgstr "" -#: monotone.cc:63 +#: monotone.cc:66 msgid "exclude merges when printing logs" msgstr "" -#: monotone.cc:64 +#: monotone.cc:67 msgid "use the current arguments as the future default" msgstr "" -#: monotone.cc:65 +#: monotone.cc:68 msgid "leave out anything described by its argument" msgstr "" -#: monotone.cc:66 +#: monotone.cc:69 msgid "use unified diff format" msgstr "" -#: monotone.cc:67 +#: monotone.cc:70 msgid "use context diff format" msgstr "" -#: monotone.cc:68 +#: monotone.cc:71 msgid "use external diff hook for generating diffs" msgstr "" -#: monotone.cc:69 +#: monotone.cc:72 msgid "argument to pass external diff hook" msgstr "" -#: monotone.cc:70 +#: monotone.cc:73 msgid "use least common ancestor as ancestor for merge" msgstr "" -#: monotone.cc:71 +#: monotone.cc:74 msgid "perform the associated file operation" msgstr "" -#: monotone.cc:72 +#: monotone.cc:75 msgid "address:port to listen on (default :4691)" msgstr "" -#: monotone.cc:73 +#: monotone.cc:76 msgid "perform the operations for files missing from workspace" msgstr "" -#: monotone.cc:74 +#: monotone.cc:77 msgid "perform the operations for unknown files from workspace" msgstr "" -#: monotone.cc:75 +#: monotone.cc:78 msgid "push the specified key even if it hasn't signed anything" msgstr "" -#: monotone.cc:76 +#: monotone.cc:79 msgid "when rosterifying, drop attrs entries with the given key" msgstr "" -#: monotone.cc:77 +#: monotone.cc:80 msgid "exclude files when printing logs" msgstr "" -#: monotone.cc:78 +#: monotone.cc:81 msgid "also operate on the contents of any listed directories" msgstr "" -#: monotone.cc:87 +#: monotone.cc:90 msgid "print debug log to stderr while running" msgstr "" -#: monotone.cc:88 +#: monotone.cc:91 msgid "file to dump debugging log to, on failure" msgstr "" -#: monotone.cc:89 +#: monotone.cc:92 msgid "file to write the log to" msgstr "arquivo onde registro será escrito" -#: monotone.cc:90 +#: monotone.cc:93 msgid "suppress log and progress messages" msgstr "" -#: monotone.cc:91 +#: monotone.cc:94 msgid "display help message" msgstr "" -#: monotone.cc:92 +#: monotone.cc:95 msgid "print version number, then exit" msgstr "" -#: monotone.cc:93 +#: monotone.cc:96 msgid "print detailed version number, then exit" msgstr "" -#: monotone.cc:94 +#: monotone.cc:97 msgid "insert command line arguments taken from the given file" msgstr "" -#: monotone.cc:95 +#: monotone.cc:98 msgid "set ticker style (count|dot|none)" msgstr "" -#: monotone.cc:96 +#: monotone.cc:99 msgid "do not load standard lua hooks" msgstr "" -#: monotone.cc:97 +#: monotone.cc:100 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" msgstr "" -#: monotone.cc:98 +#: monotone.cc:101 msgid "load extra rc file" msgstr "" -#: monotone.cc:99 +#: monotone.cc:102 msgid "set key for signatures" msgstr "" -#: monotone.cc:100 +#: monotone.cc:103 msgid "set name of database" msgstr "" -#: monotone.cc:101 +#: monotone.cc:104 msgid "limit search for workspace to specified root" msgstr "" -#: monotone.cc:102 +#: monotone.cc:105 msgid "verbose completion output" msgstr "" -#: monotone.cc:103 +#: monotone.cc:106 msgid "set location of key store" msgstr "configura localização da coleção de chaves" -#: monotone.cc:104 +#: monotone.cc:107 msgid "set location of configuration directory" msgstr "" -#: monotone.cc:208 +#: monotone.cc:211 #, c-format msgid "problem parsing arguments from file %s: %s" msgstr "" -#: monotone.cc:217 +#: monotone.cc:220 #, c-format msgid "weird error when stuffing arguments read from %s: %s\n" msgstr "" -#: monotone.cc:299 +#: monotone.cc:316 msgid "[OPTION...] command [ARGS...]\n" msgstr "" -#: monotone.cc:551 +#: monotone.cc:568 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "" -#: monotone.cc:593 +#: monotone.cc:610 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "" -#: monotone.cc:628 +#: monotone.cc:645 #, c-format msgid "Options specific to '%s %s':" msgstr "" -#: mt_version.cc:23 +#: mt_version.cc:27 #, c-format msgid "%s (base revision: %s)" msgstr "" -#: mt_version.cc:34 +#: mt_version.cc:47 #, c-format msgid "" -"Running on: %s\n" -"Changes since base revision: %s\n" +"Running on : %s\n" +"C++ compiler : %s\n" +"C++ standard library: %s\n" +"Boost version : %s\n" +"Changes since base revision:\n" +"%s" msgstr "" #: netcmd.cc:40 @@ -2469,20 +2433,17 @@ "this suggests data was corrupted in transit\n" msgstr "" -#: netcmd.cc:257 -#: netcmd.cc:303 +#: netcmd.cc:257 netcmd.cc:303 #, c-format msgid "unknown role specifier %d" msgstr "" -#: netio.hh:38 -#: netio.hh:56 +#: netio.hh:38 netio.hh:56 #, c-format msgid "need %d bytes to decode %s at %d, only have %d" msgstr "" -#: netio.hh:84 -#: netio.hh:119 +#: netio.hh:84 netio.hh:119 #, c-format msgid "uleb128 decode for '%s' into %d-byte datum overflowed" msgstr "" @@ -2519,8 +2480,7 @@ msgid "certs in" msgstr "" -#: netsync.cc:716 -#: netsync.cc:729 +#: netsync.cc:716 netsync.cc:729 msgid "revs in" msgstr "" @@ -2528,8 +2488,7 @@ msgid "certs out" msgstr "" -#: netsync.cc:723 -#: netsync.cc:731 +#: netsync.cc:723 netsync.cc:731 msgid "revs out" msgstr "" @@ -2584,8 +2543,7 @@ msgid "rejected attempt at anonymous connection while running as sink\n" msgstr "" -#: netsync.cc:1347 -#: netsync.cc:1444 +#: netsync.cc:1347 netsync.cc:1444 #, c-format msgid "not serving branch '%s'" msgstr "ramo '%s' não está sendo servido" @@ -2612,12 +2570,15 @@ #: netsync.cc:1430 #, c-format -msgid "denied '%s' read permission for '%s' excluding '%s' while running as pure sink\n" +msgid "" +"denied '%s' read permission for '%s' excluding '%s' while running as pure " +"sink\n" msgstr "" #: netsync.cc:1450 #, c-format -msgid "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" +msgid "" +"denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" msgstr "" #: netsync.cc:1453 @@ -2632,7 +2593,9 @@ #: netsync.cc:1472 #, c-format -msgid "denied '%s' write permission for '%s' excluding '%s' while running as pure source\n" +msgid "" +"denied '%s' write permission for '%s' excluding '%s' while running as pure " +"source\n" msgstr "" #: netsync.cc:1480 @@ -2705,18 +2668,15 @@ msgid "Received warning from usher: %s" msgstr "" -#: netsync.cc:2043 -#: netsync.cc:2074 +#: netsync.cc:2043 netsync.cc:2074 msgid "source and sink" msgstr "" -#: netsync.cc:2044 -#: netsync.cc:2075 +#: netsync.cc:2044 netsync.cc:2075 msgid "source" msgstr "" -#: netsync.cc:2044 -#: netsync.cc:2075 +#: netsync.cc:2044 netsync.cc:2075 msgid "sink" msgstr "" @@ -2725,8 +2685,7 @@ msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "" -#: netsync.cc:2241 -#: netsync.cc:2298 +#: netsync.cc:2241 netsync.cc:2298 #, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "" @@ -2793,7 +2752,8 @@ #: netsync.cc:2482 #, c-format -msgid "peer %s read failed in shutdown state (possibly client misreported error)\n" +msgid "" +"peer %s read failed in shutdown state (possibly client misreported error)\n" msgstr "" #: netsync.cc:2488 @@ -2808,7 +2768,8 @@ #: netsync.cc:2514 #, c-format -msgid "peer %s write failed in shutdown state (possibly client misreported error)\n" +msgid "" +"peer %s write failed in shutdown state (possibly client misreported error)\n" msgstr "" #: netsync.cc:2520 @@ -2845,36 +2806,35 @@ msgid "got OOB from peer %s, disconnecting\n" msgstr "" -#: netsync.cc:2776 +#: netsync.cc:2791 #, c-format msgid "finding items to synchronize:\n" msgstr "" -#: netsync.cc:2784 +#: netsync.cc:2799 msgid "certificates" msgstr "certificados" -#: netsync.cc:2893 +#: netsync.cc:2908 #, c-format msgid "Cannot find key '%s'" msgstr "Impossível achar chave '%s'" -#: netsync.cc:2933 +#: netsync.cc:2948 #, c-format msgid "" "include branch pattern contains a quote character:\n" "%s\n" msgstr "" -#: netsync.cc:2939 +#: netsync.cc:2954 #, c-format msgid "" "exclude branch pattern contains a quote character:\n" "%s\n" msgstr "" -#: netsync.cc:2962 -#: netsync.cc:2966 +#: netsync.cc:2977 netsync.cc:2981 #, c-format msgid "network error: %s" msgstr "" @@ -2899,10 +2859,7 @@ msgid "missing prerequisite revision '%s'\n" msgstr "versão pré-requisito '%s' não existe\n" -#: packet.cc:139 -#: packet.cc:150 -#: packet.cc:166 -#: packet.cc:174 +#: packet.cc:139 packet.cc:150 packet.cc:166 packet.cc:174 #, c-format msgid "dropping revision '%s'\n" msgstr "descartando versão '%s'\n" @@ -2947,17 +2904,17 @@ msgid "unknown packet type: '%s'" msgstr "" -#: rcs_file.cc:343 +#: rcs_file.cc:344 #, c-format msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" msgstr "" -#: rcs_file.cc:362 +#: rcs_file.cc:363 #, c-format msgid "parse failure %d:%d: expecting word '%s'\n" msgstr "" -#: rcs_file.cc:377 +#: rcs_file.cc:378 #, c-format msgid "parse failure %d:%d: expecting word\n" msgstr "" @@ -3038,7 +2995,7 @@ msgid "Path %s added twice with differing content\n" msgstr "" -#: revision.cc:1273 +#: revision.cc:1281 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3047,17 +3004,17 @@ "seriously, if you'd like to keep it, we're happy to figure out how)" msgstr "" -#: revision.cc:1385 +#: revision.cc:1393 #, c-format msgid "converting existing revision graph to new roster-style revisions\n" msgstr "" -#: revision.cc:1440 +#: revision.cc:1448 #, c-format msgid "rebuilding revision graph from manifest certs\n" msgstr "" -#: revision.cc:1543 +#: revision.cc:1551 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3065,30 +3022,30 @@ "a newer version of monotone is required to complete this operation" msgstr "" -#: sanity.cc:116 +#: sanity.cc:117 #, c-format msgid "fatal: formatter failed on %s:%d: %s" msgstr "" -#: sanity.cc:190 +#: sanity.cc:191 msgid "misuse: " msgstr "mal-uso:" -#: sanity.cc:202 +#: sanity.cc:203 msgid "error: " msgstr "erro:" -#: sanity.cc:210 +#: sanity.cc:211 #, c-format msgid "%s:%d: invariant '%s' violated" msgstr "" -#: sanity.cc:223 +#: sanity.cc:224 #, c-format msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d\n" msgstr "" -#: sanity.cc:244 +#: sanity.cc:245 #, c-format msgid "Current work set: %i items\n" msgstr "" @@ -3151,7 +3108,8 @@ #: schema_migration.cc:303 #, c-format msgid "no migration performed; database schema already up-to-date at %s\n" -msgstr "migração não executada, esquema do banco de dados já atualizado com %s\n" +msgstr "" +"migração não executada, esquema do banco de dados já atualizado com %s\n" #: schema_migration.cc:853 #, c-format @@ -3172,54 +3130,53 @@ msgid "failed to convert string from %s to %s: '%s'" msgstr "erro convertendo cadeia de %s para %s: '%s'" -#: transforms.cc:741 -#: transforms.cc:755 +#: transforms.cc:741 transforms.cc:755 #, c-format msgid "error converting %d UTF-8 bytes to IDNA ACE: %s" msgstr "" -#: ui.cc:108 +#: ui.cc:109 #, c-format msgid "%.1f G" msgstr "%.1f G" -#: ui.cc:114 +#: ui.cc:115 #, c-format msgid "%.1f M" msgstr "%.1f M" -#: ui.cc:120 +#: ui.cc:121 #, c-format msgid "%.1f k" msgstr "%.1f k" -#: ui.cc:137 -#: ui.cc:139 +#: ui.cc:134 #, c-format msgid "%d/%d" msgstr "%d/%d" -#: ui.cc:146 +#: ui.cc:139 #, c-format msgid "%d" msgstr "%d" -#: ui.cc:369 +#: ui.cc:408 #, c-format msgid "" "fatal: %s\n" "this is almost certainly a bug in monotone.\n" -"please send this error message, the output of 'monotone --full-version',\n" +"please send this error message, the output of '%s --full-version',\n" "and a description of what you were doing to %s.\n" msgstr "" "fatal: %s\n" "isto é quase certamente um defeito em monotone.\n" -"por favor envie esta mensagem de erro, a saída de 'monotone --full-version',\n" +"por favor envie esta mensagem de erro, a saída de '%s --full-version',\n" "e uma descrição do que você estava fazendo para %s.\n" -#: ui.cc:422 -msgid "monotone: " -msgstr "monotone: " +#: ui.cc:469 +#, c-format +msgid "failed to open log file '%s'" +msgstr "Erro abrindo arquivo de registro '%s'" #: update.cc:65 #, c-format @@ -3386,14 +3343,12 @@ msgid "dropping %s" msgstr "descartando %s" -#: work.cc:905 -#: work.cc:916 +#: work.cc:905 work.cc:916 #, c-format msgid "path %s already exists" msgstr "caminho '%s' já existe" -#: work.cc:938 -#: work.cc:965 +#: work.cc:938 work.cc:965 #, c-format msgid "adding %s" msgstr "adicionando %s" @@ -3428,29 +3383,48 @@ msgid "updating %s" msgstr "atualizando %s" +#~ msgid "negative or zero last not allowed\n" +#~ msgstr "último negativo ou zero não permitido\n" + +#~ msgid "negative or zero next not allowed\n" +#~ msgstr "próximo negativo ou zero não permitido\n" + +#~ msgid "monotone: " +#~ msgstr "monotone: " + #~ msgid "working copy" #~ msgstr "cópia de trabalho" + #~ msgid "OLDID NEWID" #~ msgstr "VELHO-ID NOVO-ID" + #~ msgid "write file delta packet to stdout" #~ msgstr "escreve pacote de delta de arquivo em stdout" + #~ msgid "no such file '%s'" #~ msgstr "não há arquivo '%s'" + #~ msgid "write revision data packet to stdout" #~ msgstr "escreve pacote de dados da versão em stdout" + #~ msgid "write file data packet to stdout" #~ msgstr "escreve pacote de dados do arquivo em stdout" + #~ msgid "write cert packets to stdout" #~ msgstr "escreve pacotes de certificado em stdout" + #~ msgid "Error running editor '%s' to enter log message\n" #~ msgstr "Erro executando editor '%s' para entrada de mensagem de registro\n" + #~ msgid "executing external 3-way merge command\n" #~ msgstr "executando comando externo para combinação de 3 arquivos\n" + #~ msgid "adding %s to working copy delete set\n" #~ msgstr "adicionando %s ao conjunto de remoções da cópia de trabalho\n" + #~ msgid "adding %s -> %s to working copy rename set" #~ msgstr "" #~ "adicionando %s -> %s ao conjunto de renomeações da cópia de trabalho" + #~ msgid "renaming '%s' onto existing file: '%s'\n" #~ msgstr "renomeando '%s' para arquivo existente: '%s'\n" -