diff --git a/po/pt_PT.po b/po/pt_PT.po index 3b15fccf9a..1b8437e735 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,5 +1,5 @@ -# Portugual's Portuguese translations for Git package. -# Copyright (C) 2020 Daniel Santos +# Portugal's Portuguese translations for Git package. +# Copyright (C) 2021 Daniel Santos # This file is distributed under the same license as the Git package. # Contributors: # - Daniel Santos @@ -12,129 +12,158 @@ # English | Portuguese # ---------------------------------+-------------------------------------- # 3-way merge | tri-junção -# abbreviate | -# alternate object database | -# amend | -# ancestor | -# annotated tag | +# abbreviate | abreviar +# alternate object database | base dados de objetos alternativa +# amend | emendar +# ancestor | antepassado +# annotated tag | etiqueta anotada # bare repository | repositório nú -# bisect | -# blob object | -# bloom filter | +# bisect | bifurcar +# blob object | objeto-blob # branch | ramo -# bundle | -# bypass | -# cache | cache -# chain | -# changeset | -# checkout | -# checksum | +# bundle | conjunto +# bypass | desviar +# cache | cenário +# chain | corrente +# changeset | memória +# checkout | observar +# checksum | checksum # cherry-picking | apanhar -# clean | -# clone | +# clean | limpa +# clone | clone # commit | memorizar # commit message | mensagem de memória -# commit object | objeto da memória +# commit object | objeto de memória # commit-ish (also committish) | mnemónica # conflict | conflito -# core Git | -# cover letter | +# core Git | núcleo-Git +# cover letter | carta de apresentação # DAG | DAG -# dangling object | objeto DAG +# dangling object | objeto perdido # detached HEAD | HEAD solta # directory | pasta -# dirty | -# dumb HTTP protocol | -# evil merge | -# fast-forward | +# dirty | suja +# dumb HTTP protocol | protocolo HTTP burro +# evil merge | junção malvada +# fast-forward | avanço # fetch | buscar -# file system | -# fork | aforquilhar -# Git archive | -# gitfile | -# grafts | -# hash | +# file system | sistema de ficheiro +# fork | ramificar +# Git archive | repositório +# gitfile | ficheiro-git +# grafts | enxertos +# hash | hash # HEAD | HEAD -# head | -# head ref | +# head | cabeça +# head ref | ref-cabeça # header | cabeçalho -# hook | +# hook | gancho # hunk | pedaço -# index | -# index entry | -# loose object | -# loose refs | -# master | +# index | cenário +# index entry | entrada de cenário +# loose object | objeto solto +# loose refs | refs soltas +# master | master # merge | junção -# object | -# object database | -# object identifier | -# object name | -# object type | -# octopus | -# origin | -# pack | -# pack index | -# packfile | -# parent | -# patch | -# pathspec | -# pattern | pattern -# pickaxe | -# plumbing | -# porcelain | -# precious-objects repo | -# prune | +# object | objeto +# object database | base dados de objeto +# object identifier | identificador de objeto +# object name | nome de objeto +# object type | tipo de objeto +# octopus | polvinho +# origin | origin +# pack | pacote +# pack index | índice de pacote +# packfile | ficheiro-pacote +# parent | parente +# patch | remendo +# pathspec | espetro-caminho +# pattern | padrão +# pickaxe | picareta +# plumbing | nuclear +# porcelain | porcelana +# precious-objects repo | repo de objetos preciosos +# prune | podar # pull | agarrar # push | atirar -# reachable | -# rebase | -# ref | -# reflog | -# refspec | -# remote | -# remote-tracking branch | -# replay | +# reachable | acessível +# rebase | rebasear +# ref | ref +# reflog | registo-ref +# refspec | espetro-ref +# remote | remoto +# remote-tracking branch | ramo remoto de monitorização +# replay | replay # repo | repo # repository | repositório -# reset | reposição -# resolve | +# reset | restabelecer +# resolve | resolver # revert | reverter # revision | revisão -# rewind | -# SCM | +# rewind | rebobinar +# SCM | SCM # SHA-1 | SHA-1 -# shallow repository | -# signed tag | -# smart HTTP protocol | -# squash | +# shallow repository | repositório raso +# signed tag | etiqueta assinada +# smart HTTP protocol | protocolo HTTP esperto +# squash | esmagar # squelch | suprimir -# stage | preparar -# stash | arrumos -# submodule | -# symref | -# tag | -# tag object | -# tagger | -# topic branch | -# track | seguir -# trailer | -# tree | -# tree object | -# tree-ish (also treeish) | -# unmerged index | -# unpack | -# unreachable object | -# unstage | despreparar +# stage | cenário +# stash | esconderijo +# submodule | submódulo +# superproject | super-projeto +# symref | ref-simbólica +# tag | etiqueta +# tag object | objeto-etiqueta +# tagger | etiquetador +# topic branch | ramo-tópico +# track | monitorizar +# trailer | atribuições +# tree | árvore +# tree object | objeto-árvore +# tree-ish (also treeish) | arvoredo +# unmerged index | cenário por juntar +# unpack | desempacotar +# unreachable object | objeto inacessível +# unstage | desencenar # upstream | upstream -# upstream branch | ramo upstream -# working tree | +# upstream branch | ramo-upstream +# working tree | árvore de trabalho +# +# +# Other translation table helper +# +# English | Portuguese +# ---------------------------------+-------------------------------------- +# apply | submeter +# bind | vincular +# call | chamar +# chain | série +# change | alteração +# default | predefinido +# delete | apagar +# edit | modificação +# feature | feição +# given | fornecido +# handle | pega +# in progress | em curso +# named | denominado +# not supported | insustentado +# parse | processar +# path | caminho +# scan | sondar +# set | definir +# sparse | disperso +# stat | stat +# support | sustenta +# untrack | desmonitorizar +# # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2020-12-15 16:27+0800\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" "PO-Revision-Date: 2020-10-14 11:43+0100\n" "Last-Translator: Daniel Santos \n" "Language-Team: Git L10N Português \n" @@ -149,9 +178,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "O quê (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 -#: builtin/rebase.c:1955 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "incapaz de ler index" @@ -177,9 +206,9 @@ msgstr "Atualizar" #: add-interactive.c:697 add-interactive.c:885 #, fuzzy, c-format msgid "could not stage '%s'" -msgstr "inacapaz de stage '%s'" +msgstr "incapaz de stage '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 #, fuzzy msgid "could not write index" msgstr "incapaz de escrever index" @@ -196,7 +225,7 @@ msgstr[1] "actualizou %d paths\n" msgid "note: %s is untracked now.\n" msgstr "nota: %s agora está por seguir.\n" -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -239,12 +268,12 @@ msgstr[1] "adicionei %d paths\n" msgid "ignoring unmerged: %s" msgstr "ignorando unmerged: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Apenas ficheiros binários mudaram.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sem modificação.\n" @@ -273,7 +302,7 @@ msgstr "reverter conjunto das modificações staged de volta para a versão HEAD #: add-interactive.c:1016 #, fuzzy msgid "pick hunks and update selectively" -msgstr "apanha os pedaços e atualiza selectivamente" +msgstr "apanha os pedaços e atualiza seletivamente" #: add-interactive.c:1018 #, fuzzy @@ -330,11 +359,11 @@ msgstr "seleciona item numerado" msgid "(empty) select nothing" msgstr "(vazio) seleciona nada" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "E agora" @@ -346,10 +375,10 @@ msgstr "staged" msgid "unstaged" msgstr "unstaged" -#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 @@ -361,7 +390,7 @@ msgstr "path" msgid "could not refresh index" msgstr "incapaz de reactualizar o index" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adeus.\n" @@ -594,7 +623,7 @@ msgstr "" #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, fuzzy, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar modo de modficação de index e worktree [y,n,q,a,d%s,?]?" +msgstr "Descartar modo de modificação de index e worktree [y,n,q,a,d%s,?]?" #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, fuzzy, c-format, perl-format @@ -676,36 +705,36 @@ msgstr "" "a - submeter este pedaço e qualquer próximo deste ficheiro\n" "d - declinar este pedaço e qualquer próximo deste ficheiro\n" -#: add-patch.c:342 +#: add-patch.c:343 #, fuzzy, c-format msgid "could not parse hunk header '%.*s'" -msgstr "incapaz de analisar ínicio de pedaço '%s'" +msgstr "incapaz de analisar início de pedaço '%s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, fuzzy, c-format msgid "could not parse colored hunk header '%.*s'" -msgstr "incapaz de analizar início de pedaço colorido '%.*s'" +msgstr "incapaz de analisar início de pedaço colorido '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 #, fuzzy msgid "could not parse diff" msgstr "incapaz de analisar diff" -#: add-patch.c:438 +#: add-patch.c:439 #, fuzzy msgid "could not parse colored diff" msgstr "incapaz de analisar diff colorido" -#: add-patch.c:452 +#: add-patch.c:453 #, fuzzy, c-format msgid "failed to run '%s'" -msgstr "falha ao executar '%s'" +msgstr "falhou executar '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "sem match de output de interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -713,7 +742,7 @@ msgstr "" "O teu filtro tem de manter uma correspondência exata\n" "entre seu input e linhas output." -#: add-patch.c:790 +#: add-patch.c:791 #, fuzzy, c-format msgid "" "expected context line #%d in\n" @@ -722,7 +751,7 @@ msgstr "" "linha de contexto esperada #%d em\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -735,11 +764,11 @@ msgstr "" "\ttermina sem:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, fuzzy, c-format msgid "" "---\n" @@ -753,7 +782,7 @@ msgstr "" "Linhas começadas com %c serão removidas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -763,12 +792,12 @@ msgstr "" "editar. Se todas as linhas deste pedaço forem removidas, então a edição\n" "é abortada e este pedaço é deixado inalterado.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 #, fuzzy msgid "could not parse hunk header" msgstr "incapaz interpretar início de pedaço" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' falhou" @@ -784,27 +813,27 @@ msgstr "'git apply --cached' falhou" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -"Problema na submissão de pedaço editado. Editar de novo (responder " -"\"n\" para \"não\" descarta!) [y/n]? " +"Problema na submissão de pedaço editado. Editar de novo (responder \"n\" " +"para \"não\" descarta!) [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 #, fuzzy msgid "The selected hunks do not apply to the index!" msgstr "Submissão incorreta de pedaços selecionados para index!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Submetê-los para worktree mesmo assim? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Nada foi submetido.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 #, fuzzy msgid "" "j - leave this hunk undecided, see next undecided hunk\n" @@ -827,77 +856,77 @@ msgstr "" "e - editar manualmente o pedaço atual\n" "? - mostrar ajuda\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 #, fuzzy msgid "No previous hunk" msgstr "Sem pedaço anterior" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 #, fuzzy msgid "No next hunk" msgstr "Sem próximo pedaço" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Sem qualquer outro pedaço" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " msgstr "ir para qual pedaço ( para ver mais)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "ir para qual pedaço? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, fuzzy, c-format msgid "Invalid number: '%s'" msgstr "Número inválido: '%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, fuzzy, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Lamento, apenas %d pedaço disponível." msgstr[1] "Lamento, apenas %d pedaços disponíveis." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Sem outro pedaço a procurar" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "procurar por regex? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, fuzzy, c-format msgid "Malformed search regexp %s: %s" msgstr "Pesquisa regexp deformada %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 #, fuzzy msgid "No hunk matches the given pattern" msgstr "Sem pedaço correspondente ao padrão fornecido" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Lamento, incapaz de dividir este pedaço" -#: add-patch.c:1623 +#: add-patch.c:1624 #, fuzzy, c-format msgid "Split into %d hunks." msgstr "Dividir em %d pedaços." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Lamento, incapaz de editar este pedaço" -#: add-patch.c:1679 +#: add-patch.c:1680 #, fuzzy msgid "'git apply' failed" msgstr "'git apply' falhou" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -906,37 +935,37 @@ msgstr "" "\n" "Desative este mensagem com \"git config advice.%s false\"" -#: advice.c:159 +#: advice.c:161 #, fuzzy, c-format msgid "%shint: %.*s%s\n" msgstr "%sdica: %.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Cherry-picking é impossível porque tem ficheiros em separado." -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "Cometer é impossível porque tem ficheiros em separado." -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "Juntar é impossível porque tem ficheiros em separado." -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "Puxar é impossível porque tem ficheiros em separado." -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "Reverter é impossível porque tem ficheiros em separado." -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "É impossível fazer %s porque tem ficheiros em separado." -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -944,23 +973,36 @@ msgstr "" "Corrija-os em worktree, e use 'git add/rm ' apropriadamente\n" "para marcar resolução e fazer uma memória." -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "Saindo devido a conflito por resolver." -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "O teu juntar ficou por concluír (MERGE_HEAD presente)." +msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)." -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "Por favor, memoriza as tuas modificações antes de juntar." -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "Saindo devido a juntar inacabado." -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" + +#: advice.c:310 #, fuzzy, c-format msgid "" "Note: switching to '%s'.\n" @@ -997,7 +1039,7 @@ msgstr "" "\n" " git switch -\n" "\n" -"Desliga este conselho pondo a variável de config advice.detachedHead em" +"Desliga este conselho pondo a variável de config advice.detachedHead em " "false\n" "\n" @@ -1010,85 +1052,83 @@ msgstr "cmdline termina com \\" msgid "unclosed quote" msgstr "aspa aberta" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opção de whitespace desconhecida '%s'" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opção de ignorar whitespace desconhecida '%s'" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject e --3way só podem ser usados separadamente." -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached e --3way só podem ser usados separadamente." - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way fora de um repositório" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index fora de um repositório" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" -msgstr "--cached fora de um repositório" +msgstr "--cached fora de repositório" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Incapaz preparar timestamp de regexp %s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec devolveu %d para input: %s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha " +msgstr "" +"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d" + +#: apply.c:927 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha " "%d" #: apply.c:928 #, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: git-diff incorreto - novo nome de ficheiro inconsistente " -"na linha %d" - -#: apply.c:929 -#, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: git-diff incorreto - antigo nome de ficheiro inconsistente " -"na linha %d" +msgstr "" +"git apply: git-diff incorreto - antigo nome de ficheiro inconsistente na " +"linha %d" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d" -#: apply.c:963 +#: apply.c:962 #, fuzzy, c-format msgid "invalid mode on line %d: %s" msgstr "modo inválido na linha %d: %s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "linhas de cabeçalho %d e %d inconsistentes" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1103,92 +1143,92 @@ msgstr[1] "" "cabeçalho do git diff falta informação de nome de ficheiro quando removendo " "%d componentes do pathname (linha %d)" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recontagem: linha inesperada: %.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "novo ficheiro depende de conteúdos antigos" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "ficheiro eliminado ainda tem conteúdos" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "patch roto na linha %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "novo ficheiro %s depende de conteúdos antigos" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "ficheiro apagado %s ainda tem conteúdos" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** aviso: ficheiro %s fica vazio e mantêm-se" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binário roto na linha %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binário irreconhecível na linha %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch com apenas lixo na linha %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "incapaz de ler ligação simbólica %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "incapaz de abrir ou ler %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "início de linha inválido: '%c'" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)." msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)." -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1197,135 +1237,141 @@ msgstr "" "procurando por:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "faltando patch binário para '%s'" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "incapaz submeter-inversamente patch binário sem pedaço " -"inverso a '%s'" +msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum." -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "incapaz ler a postimage necessária %s para '%s'" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "path binário submete-se a '%s' de maneira nenhuma" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "patch binário para '%s' cria resultado incorreto (esperei %s, " -"recebi %s)" +msgstr "" +"patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "patch falhou: %s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "incapaz de checkout %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "falha a ler %s" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lendo '%s' além de uma ligação simbólica" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "path %s mudou de nome ou foi eliminado" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s: tem inexistência no index" -#: apply.c:3537 apply.c:3708 apply.c:3953 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s: no index há correspondência nenhuma" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." +#: apply.c:3571 +#, fuzzy +msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "repositório falta o blob necessário para recorrer à tri-junção." -#: apply.c:3575 -#, c-format -msgid "Falling back to three-way merge...\n" +#: apply.c:3574 +#, fuzzy, c-format +msgid "Performing three-way merge...\n" msgstr "A recorrer a integração com 3 pontos...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "incapaz ler conteúdo atual de '%s'" -#: apply.c:3607 -#, c-format -msgid "Failed to fall back on three-way merge...\n" +#: apply.c:3606 +#, fuzzy, c-format +msgid "Failed to perform three-way merge...\n" msgstr "Falha a recorrer a integração com 3 pontos...\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch aplicado a '%s' com conflitos.\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch aplicado a '%s' com sucesso.\n" -#: apply.c:3652 +#: apply.c:3642 +#, fuzzy, c-format +msgid "Falling back to direct application...\n" +msgstr "A recorrer a integração com 3 pontos...\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "patch de remoção deixa conteúdos no ficheiro" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errado" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s é do tipo %o, esperado %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "caminho inválido '%s'" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s: já existe no índice" @@ -1358,7 +1404,7 @@ msgstr "%s: patch submete-se de maneira nenhuma" #: apply.c:4020 #, c-format msgid "Checking patch %s..." -msgstr "A verificar o patch %s..." +msgstr "" #: apply.c:4112 #, c-format @@ -1410,7 +1456,7 @@ msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s" msgid "unable to add cache entry for %s" msgstr "incapaz adicionar entrada de cache para %s" -#: apply.c:4376 builtin/bisect--helper.c:524 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "falha a escrever para '%s'" @@ -1446,7 +1492,7 @@ msgstr[1] "A aplicar patch %%s com %d rejeições..." msgid "truncating .rej filename to %.*s.rej" msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "incapaz abrir %s" @@ -1461,172 +1507,175 @@ msgstr "Excerto nº%d aplicado com sucesso." msgid "Rejected hunk #%d." msgstr "Excerto nº%d rejeitado." -#: apply.c:4720 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorado." -#: apply.c:4728 +#: apply.c:4733 msgid "unrecognized input" msgstr "input desconhecido" -#: apply.c:4748 +#: apply.c:4753 msgid "unable to read index file" msgstr "incapaz ler ficheiro index" -#: apply.c:4905 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "incapaz abrir patch '%s': %s" -#: apply.c:4932 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erro de espaço em branco reprimido" msgstr[1] "%d erros de espaço em branco reprimidos" -#: apply.c:4938 apply.c:4953 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d linha adiciona erros de espaço em branco." msgstr[1] "%d linhas adicionam erros de espaço em branco." -#: apply.c:4946 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco." msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco." -#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Incapaz de escrever novo ficheiro index" -#: apply.c:4990 +#: apply.c:4995 msgid "don't apply changes matching the given path" -msgstr "submeter de maneira nenhuma alterações correspondentes a path fornecido" +msgstr "" +"submeter de maneira nenhuma alterações correspondentes a path fornecido" -#: apply.c:4993 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "submeter alterações correspondentes a path fornecido" -#: apply.c:4995 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "num" -#: apply.c:4996 +#: apply.c:5001 msgid "remove leading slashes from traditional diff paths" msgstr "remover barras à esquerda dos caminhos de diff tradicional" -#: apply.c:4999 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "ignorar adições feitas pelo patch" -#: apply.c:5001 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "invés aplicada patch, output diffstat para " -#: apply.c:5005 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar número de linhas adicionadas e removidas em notação decimal" -#: apply.c:5007 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" -#: apply.c:5009 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" -#: apply.c:5011 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "garantir que o patch pode ser aplicado ao índice atual" -#: apply.c:5013 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5015 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "aplicar um patch sem tocar na árvore de trabalho" -#: apply.c:5017 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "aceitar patches que alteram ficheiros fora da área de trabalho" -#: apply.c:5020 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplicar o patch também (use com --stat/--summary/--check)" -#: apply.c:5022 -msgid "attempt three-way merge if a patch does not apply" +#: apply.c:5027 +#, fuzzy +msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma" -#: apply.c:5024 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "" "construir um índice temporário baseado na informação incorporada do índice" -#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "os caminhos estão separados por caracteres NUL" -#: apply.c:5029 +#: apply.c:5034 msgid "ensure at least lines of context match" msgstr "garantir que, pelo menos, linhas de contexto coincidem" -#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 +#: builtin/rebase.c:1347 msgid "action" msgstr "ação" -#: apply.c:5031 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "detetar linhas novas ou modificadas que tenham espaços em branco" -#: apply.c:5034 apply.c:5037 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: apply.c:5040 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "aplicar o patch em reverso" -#: apply.c:5042 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "conta com linha de contexto nenhuma" -#: apply.c:5044 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" +msgstr "deixar os pedaços rejeitados nos respetivos ficheiros *.rej" -#: apply.c:5046 +#: apply.c:5051 msgid "allow overlapping hunks" -msgstr "permitir a sobreposição de excertos" +msgstr "permitir a sobreposição de pedaços" -#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5049 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar deteções incorretas de falta de nova linha no final do ficheiro" -#: apply.c:5052 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "desconfia da contagem de linhas nos headers de pedaços" -#: apply.c:5054 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "raiz" -#: apply.c:5055 +#: apply.c:5060 msgid "prepend to all filenames" msgstr "preceder a todos os nomes de ficheiro" @@ -1665,7 +1714,7 @@ msgstr "" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "erro ao compactar (%d)" @@ -1694,145 +1743,145 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c:192 +#: archive.c:188 #, fuzzy, c-format msgid "cannot read %s" -msgstr "incapaz ler '%s'" +msgstr "incapaz ler %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "incapaz ler '%s'" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "especificador de path '%s' correspondeu a ficheiro nenhum" -#: archive.c:454 +#: archive.c:451 #, fuzzy, c-format msgid "no such ref: %.*s" -msgstr "referência inexistente %s" +msgstr "ref inexistente: %.*s" -#: archive.c:460 +#: archive.c:457 #, fuzzy, c-format msgid "not a valid object name: %s" msgstr "nome de objeto inválido: %s" -#: archive.c:473 +#: archive.c:470 #, fuzzy, c-format msgid "not a tree object: %s" msgstr "é objeto árvore nenhum: %s" -#: archive.c:485 +#: archive.c:482 #, fuzzy msgid "current working directory is untracked" msgstr "pasta de trabalho atual está por seguir" -#: archive.c:526 +#: archive.c:523 #, fuzzy, c-format msgid "File not found: %s" msgstr "ficheiro por encontrar: %s" -#: archive.c:528 +#: archive.c:525 #, fuzzy, c-format msgid "Not a regular file: %s" msgstr "É ficheiro normal nenhum: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "fmt" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "formato do arquivo" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "prefixo" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "ficheiro" -#: archive.c:559 +#: archive.c:556 #, fuzzy msgid "add untracked file to archive" msgstr "adiciona ficheiro por seguir a arquivo" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escreve arquivo para este ficheiro" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "ler .gitattributes do diretório de trabalho" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "listar ficheiros arquivados para stderr" -#: archive.c:567 +#: archive.c:564 #, fuzzy msgid "set compression level" msgstr "nível de compactação do pacote" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repo" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "obter o arquivo a partir do repositório remoto " -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "caminho para o comando git-upload-archive no remoto" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "Opção inesperada --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" -msgstr "A opção --exec só pode ser usada em conjunto com --remote" +msgstr "Opção --exec apenas pode ser usada com --remote" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "Opção inesperada --output" -#: archive.c:588 +#: archive.c:585 #, fuzzy msgid "Options --add-file and --remote cannot be used together" msgstr "Opções --add-file e --remote podem nada ser usadas juntas" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de arquivo desconhecido '%s'" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento por ser suportado para formato '%s': -%d" @@ -1842,12 +1891,12 @@ msgstr "Argumento por ser suportado para formato '%s': -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s é nome de atributo inválido" -#: attr.c:359 +#: attr.c:363 #, fuzzy, c-format msgid "%s not allowed: %s:%d" msgstr "falha ao aplicar o patch: %s:%ld" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1929,12 +1978,12 @@ msgstr "A bissetar: uma base de integração tem de ser testada\n" msgid "a %s revision is needed" msgstr "precisa-se de uma revisão %s" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "incapaz criar ficheiro '%s'" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "incapaz ler ficheiro '%s'" @@ -1949,10 +1998,10 @@ msgid "%s was both %s and %s\n" msgstr "%s era %s e %s em simultâneo\n" #: bisect.c:1066 -#, c-format +#, fuzzy, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "Nenhum commit testável encontrado.\n" "Talvez tenha começado com parâmetros de caminho incorretos?\n" @@ -1974,39 +2023,39 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n" msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse são imiscíveis." -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "usar --contents com nome de objeto commit final é impossível" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse e --first-parent juntos requer que se especifique o último commit" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "falha ao configurar percurso de revisões" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "path %s inexistente em %s" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "incapaz ler blob %s para path %s" @@ -2095,7 +2144,9 @@ msgstr "Incapaz de forçar a atualização do ramo atual." #: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo nenhum." +msgstr "" +"Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo " +"nenhum." #: branch.c:235 #, c-format @@ -2137,390 +2188,395 @@ msgstr "Nome de objeto ambíguo: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Ponto no ramo inválido: '%s'." -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' foi já extraído em '%s'" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD da working tree %s está desatualizada" -#: bundle.c:41 +#: bundle.c:44 #, fuzzy, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algoritmo hash de bundle irreconhecível: %s" -#: bundle.c:45 +#: bundle.c:48 #, fuzzy, c-format msgid "unknown capability '%s'" msgstr "capacidade desconhecida '%s'" -#: bundle.c:71 +#: bundle.c:74 #, fuzzy, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "cabeçalho irreconhecível: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 -#: builtin/commit.c:814 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "incapaz abrir '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Falta ao repositório estes pré-requisitos de commits:" -#: bundle.c:192 +#: bundle.c:201 #, fuzzy msgid "need a repository to verify a bundle" msgstr "é preciso repositório para verificar um bundle." -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "O bundle contém esta referência:" msgstr[1] "O bundle contém estas %d referências:" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "O pacote regista um histórico completo." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "O bundle requer esta referência:" msgstr[1] "O bundle requer estas %d referências:" -#: bundle.c:319 +#: bundle.c:333 #, fuzzy msgid "unable to dup bundle descriptor" msgstr "incapaz de dup descritor de bundle" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "Impossível gerar pack-objects" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects terminaram inesperadamente" -#: bundle.c:379 -msgid "rev-list died" -msgstr "rev-list terminou inesperadamente" - -#: bundle.c:428 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "a referência '%s' é excluída pelas opções de rev-list" -#: bundle.c:498 +#: bundle.c:504 #, fuzzy, c-format msgid "unsupported bundle version %d" msgstr "fora de suporte versão bundle %d" -#: bundle.c:500 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argumento irreconhecível: %s" -#: bundle.c:530 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Criação de bundle vazio recusada." -#: bundle.c:540 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "incapaz criar '%s'" -#: bundle.c:565 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack terminou inesperadamente" +#: chunk-format.c:117 +msgid "terminating chunk id appears earlier than expected" +msgstr "" + +#: chunk-format.c:126 +#, c-format +msgid "improper chunk offset(s) % and %" +msgstr "" + +#: chunk-format.c:133 +#, c-format +msgid "duplicate chunk ID % found" +msgstr "" + +#: chunk-format.c:147 +#, c-format +msgid "final chunk has non-zero id %" +msgstr "" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valor de cor inválido: %.*s" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:204 midx.c:47 #, fuzzy msgid "invalid hash version" msgstr "especificação de caminho inválida" -#: commit-graph.c:246 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:311 +#: commit-graph.c:355 #, fuzzy, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "assinatura commit-graph %X corresponde a assinatura %X nenhuma" -#: commit-graph.c:318 +#: commit-graph.c:362 #, fuzzy, c-format msgid "commit-graph version %X does not match version %X" msgstr "commit-graph versão %X corresponde a versão %X nenhuma" -#: commit-graph.c:325 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:342 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:361 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "" - -#: commit-graph.c:433 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "" - -#: commit-graph.c:499 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:509 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:557 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:581 +#: commit-graph.c:564 #, fuzzy msgid "unable to find all commit-graph files" msgstr "incapaz de encontrar todos ficheiros commit-graph" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:742 +#: commit-graph.c:766 #, fuzzy, c-format msgid "could not find commit %s" msgstr "incapaz encontrar commit %s" -#: commit-graph.c:1042 builtin/am.c:1292 +#: commit-graph.c:799 +msgid "commit-graph requires overflow generation data but has none" +msgstr "" + +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "incapaz analisar commit %s" -#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, fuzzy, c-format msgid "unable to get type of object %s" msgstr "incapaz obter tipo de objeto %s" -#: commit-graph.c:1301 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1318 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1338 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1357 +#: commit-graph.c:1424 +#, fuzzy +msgid "Computing commit graph topological levels" +msgstr "" + +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1424 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1501 +#: commit-graph.c:1635 #, fuzzy msgid "Collecting referenced commits" msgstr "Recolhendo commits referênciados" -#: commit-graph.c:1526 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1539 +#: commit-graph.c:1673 #, fuzzy, c-format msgid "error adding pack %s" -msgstr "Erro ao rematar %s." +msgstr "error adicionando pacote %s" -#: commit-graph.c:1543 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1582 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1597 -msgid "Counting distinct commits in commit graph" -msgstr "" - -#: commit-graph.c:1629 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1678 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1720 midx.c:819 +#: commit-graph.c:1812 midx.c:911 #, fuzzy, c-format msgid "unable to create leading directories of %s" msgstr "incapaz criar as pastas superiores a %s" -#: commit-graph.c:1733 +#: commit-graph.c:1825 #, fuzzy msgid "unable to create temporary graph layer" msgstr "incapaz criar camada de grafo temporária" -#: commit-graph.c:1738 +#: commit-graph.c:1830 #, fuzzy, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "incapaz de ajustar permissão partilhada para '%s'" -#: commit-graph.c:1808 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1853 +#: commit-graph.c:1923 #, fuzzy msgid "unable to open commit-graph chain file" msgstr "incapaz abrir ficheiro commit-graph chain" -#: commit-graph.c:1869 +#: commit-graph.c:1939 #, fuzzy msgid "failed to rename base commit-graph file" -msgstr "Falha ao criar os ficheiros de saída" +msgstr "" -#: commit-graph.c:1889 +#: commit-graph.c:1959 #, fuzzy msgid "failed to rename temporary commit-graph file" msgstr "falha a renomear ficheiro commit-graph temporário" -#: commit-graph.c:2015 +#: commit-graph.c:2092 #, fuzzy msgid "Scanning merged commits" msgstr "A adicionar %s integrado" -#: commit-graph.c:2059 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2165 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2274 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "" - -#: commit-graph.c:2285 +#: commit-graph.c:2351 #, fuzzy msgid "too many commits to write graph" msgstr "demasiados commits para escrever grafo" -#: commit-graph.c:2378 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2388 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2398 commit-graph.c:2413 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2405 +#: commit-graph.c:2476 #, fuzzy, c-format msgid "failed to parse commit %s from commit-graph" msgstr "incapaz analisar commit %s de commit-graph" -#: commit-graph.c:2423 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2438 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2445 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2455 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2464 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2478 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2483 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2487 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2503 +#: commit-graph.c:2575 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" +msgid "commit-graph generation for commit %s is % < %" msgstr "" -#: commit-graph.c:2509 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "incapaz analisar %s" @@ -2542,27 +2598,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1172 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tem assinatura GPG desconfiada, alegadamente por %s." -#: commit.c:1176 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tem assinatura GPG incorreta, alegadamente por %s." -#: commit.c:1179 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s tem assinatura GPG nenhuma." -#: commit.c:1182 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s tem assinatura correta, por %s\n" -#: commit.c:1436 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2577,7 +2633,7 @@ msgstr "" msgid "memory exhausted" msgstr "memória esgotada" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2587,300 +2643,345 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:141 +#: config.c:142 #, fuzzy, c-format msgid "could not expand include path '%s'" msgstr "incapaz de expandir include path '%s'" -#: config.c:152 +#: config.c:153 #, fuzzy msgid "relative config includes must come from files" msgstr "" "configuração relativa com inclusão condicional deve provir de ficheiros" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" "configuração relativa com inclusão condicional deve provir de ficheiros" -#: config.c:378 +#: config.c:396 +#, fuzzy, c-format +msgid "invalid config format: %s" +msgstr "formato de ref inválido: %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "" + +#: config.c:442 #, fuzzy, c-format msgid "key does not contain a section: %s" msgstr "chave contém secção nenhuma: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "chave inválida: %s" -#: config.c:414 +#: config.c:478 #, fuzzy, c-format msgid "invalid key (newline): %s" -msgstr "linha de identidade inválida: %s" +msgstr "" -#: config.c:450 config.c:462 +#: config.c:511 +#, fuzzy +msgid "empty config key" +msgstr "" + +#: config.c:529 config.c:541 #, fuzzy, c-format msgid "bogus config parameter: %s" msgstr "parâmetros insuficientes" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, fuzzy, c-format msgid "bogus format in %s" -msgstr "cadeia malformada %s" +msgstr "formato falso em %s" -#: config.c:836 +#: config.c:622 +#, fuzzy, c-format +msgid "bogus count in %s" +msgstr "contagem falsa em %s" + +#: config.c:626 +#, fuzzy, c-format +msgid "too many entries in %s" +msgstr "" + +#: config.c:636 +#, fuzzy, c-format +msgid "missing config key %s" +msgstr "ficheiro config inválido %s" + +#: config.c:644 +#, fuzzy, c-format +msgid "missing config value %s" +msgstr "" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "linha de configuração %d incorreta no blob %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "linha de configuração %d incorreta no ficheiro %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "linha de configuração %d incorreta na entrada padrão" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "linha de configuração %d incorreta no submódulo-blob %s" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "linha de configuração %d incorreta na linha de comandos %s" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "linha de configuração %d incorreta em %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "fora de intervalo" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "unidade inválida" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor numérico '%s' da configuração '%s' incorreto: %s" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: " "%s" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s" -#: config.c:1123 +#: config.c:1257 +#, fuzzy, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "valor numérico '%s' da configuração '%s' incorreto: %s" + +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falha ao expandir diretório de utilizador em: '%s'" -#: config.c:1132 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' em '%s' é carimbo de data/hora inválido" -#: config.c:1223 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1237 config.c:1248 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "nível de compressão zlib %d incorreto" -#: config.c:1340 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1373 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido para criação de objeto: %s" -#: config.c:1445 +#: config.c:1599 #, fuzzy, c-format msgid "malformed value for %s" msgstr "valor desformado para %s" -#: config.c:1471 +#: config.c:1625 #, fuzzy, c-format msgid "malformed value for %s: %s" -msgstr "valor inválido de %s: %s" +msgstr ": %s" -#: config.c:1472 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "nível de compactação do pacote %d incorreto" -#: config.c:1655 +#: config.c:1809 #, fuzzy, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz carregar objeto blob config '%s'" -#: config.c:1658 +#: config.c:1812 #, fuzzy, c-format msgid "reference '%s' does not point to a blob" msgstr "referência '%s' aponta para blob nenhum" -#: config.c:1675 +#: config.c:1829 #, fuzzy, c-format msgid "unable to resolve config blob '%s'" msgstr "incapaz resolver blog config '%s'" -#: config.c:1705 +#: config.c:1874 #, fuzzy, c-format msgid "failed to parse %s" msgstr "falha a analisar %s" -#: config.c:1759 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "incapaz analisar config de linha de comandos" -#: config.c:2122 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "" "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração" -#: config.c:2296 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "Inválido %s: '%s'" -#: config.c:2341 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100" -#: config.c:2387 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "incapaz analisar '%s' da configuração de linha de comandos" -#: config.c:2389 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d" -#: config.c:2473 +#: config.c:2645 #, fuzzy, c-format msgid "invalid section name '%s'" msgstr "conteúdo inválido: '%s'" -#: config.c:2505 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s tem múltiplos valores" -#: config.c:2534 +#: config.c:2706 #, fuzzy, c-format msgid "failed to write new configuration file %s" msgstr "falha a escrever novo ficheiro configuração %s" -#: config.c:2786 config.c:3112 +#: config.c:2958 config.c:3285 #, fuzzy, c-format msgid "could not lock config file %s" msgstr "incapaz trancar ficheiro config %s" -#: config.c:2797 +#: config.c:2969 #, fuzzy, c-format msgid "opening %s" msgstr "abrindo %s" -#: config.c:2834 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, fuzzy, c-format msgid "invalid pattern: %s" msgstr "padrão inválido: %s" -#: config.c:2859 +#: config.c:3031 #, fuzzy, c-format msgid "invalid config file %s" msgstr "ficheiro config inválido %s" -#: config.c:2872 config.c:3125 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" -msgstr "falha de fstat de %s" +msgstr "fstat em %s falhou" -#: config.c:2883 +#: config.c:3055 #, fuzzy, c-format -msgid "unable to mmap '%s'" -msgstr "incapaz mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "incapaz mmap '%s'%s" -#: config.c:2892 config.c:3130 +#: config.c:3065 config.c:3303 #, fuzzy, c-format msgid "chmod on %s failed" -msgstr "falha de fstat de %s" +msgstr "chmod em %s falhou" -#: config.c:2977 config.c:3227 +#: config.c:3150 config.c:3400 #, fuzzy, c-format msgid "could not write config file %s" msgstr "incapaz escrever ficheiro config %s" -#: config.c:3011 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "incapaz definir '%s' como '%s'" -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "incapaz desdefinir '%s'" -#: config.c:3103 +#: config.c:3276 #, fuzzy, c-format msgid "invalid section name: %s" -msgstr "opção inválida: %s" +msgstr "" -#: config.c:3270 +#: config.c:3443 #, fuzzy, c-format msgid "missing value for '%s'" -msgstr "valor inválido de %s" +msgstr "" #: connect.c:61 #, fuzzy @@ -2925,7 +3026,7 @@ msgstr "" #: connect.c:306 #, fuzzy, c-format msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "esperava-se raso/aprofundar, obteve-se %s" +msgstr "" #: connect.c:308 msgid "repository on the other end cannot be shallow" @@ -2934,59 +3035,59 @@ msgstr "" #: connect.c:347 #, fuzzy msgid "invalid packet" -msgstr "caminho inválido '%s'" +msgstr "" #: connect.c:367 #, fuzzy, c-format msgid "protocol error: unexpected '%s'" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "objeto desconhecido '%s' pelo formato em servidor." -#: connect.c:500 +#: connect.c:526 #, fuzzy, c-format msgid "invalid ls-refs response: %s" -msgstr "referência inválida: %s" +msgstr "" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "" -#: connect.c:640 +#: connect.c:666 #, fuzzy, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' é insustentado" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, fuzzy, c-format msgid "Looking up %s ... " -msgstr "A verificar o patch %s..." +msgstr "" -#: connect.c:735 +#: connect.c:761 #, fuzzy, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "incapaz procurar %s (porta %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, fuzzy, c-format msgid "" "unable to connect to %s:\n" @@ -2996,64 +3097,68 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 #, fuzzy msgid "done." msgstr "concluído." -#: connect.c:798 +#: connect.c:824 #, fuzzy, c-format msgid "unable to look up %s (%s)" msgstr "incapaz procurar %s (%s)" -#: connect.c:804 +#: connect.c:830 #, fuzzy, c-format msgid "unknown port %s" -msgstr "opção desconhecido %s" +msgstr "" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:953 +#: connect.c:979 #, fuzzy, c-format msgid "cannot start proxy %s" msgstr "incapaz começar proxy %s" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1248 +#: connect.c:1276 #, fuzzy msgid "ssh variant 'simple' does not support setting port" msgstr "ssh variant 'simple' insustenta definir porta" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1408 +#: connect.c:1436 #, fuzzy msgid "unable to fork" msgstr "incapaz de aforquilhar" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "A verificar conectividade" @@ -3063,23 +3168,23 @@ msgstr "Impossível executar 'git rev-list'" #: connected.c:144 msgid "failed write to rev-list" -msgstr "falha ao escrever para rev-list" +msgstr "falhou escrever para rev-list" #: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "falha ao fechar entrada padrão de rev-list" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:196 #, fuzzy, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF será substituído por LF em %s." -#: convert.c:209 +#: convert.c:198 #, fuzzy, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3088,12 +3193,12 @@ msgstr "" "CRLF será substituído por LF em %s.\n" "O final de linha original será mantido no ficheiro da sua árvore de trabalho." -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF será substituído por CRLF em %s." -#: convert.c:219 +#: convert.c:208 #, fuzzy, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3102,91 +3207,91 @@ msgstr "" "LF será substituído por CRLF em %s.\n" "O final de linha original será mantido no ficheiro da sua árvore de trabalho." -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, fuzzy, c-format msgid "failed to encode '%s' from %s to %s" msgstr "falha ao copiar notas de '%s' para '%s'" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:665 +#: convert.c:654 #, fuzzy, c-format msgid "cannot fork to run external filter '%s'" msgstr "incapaz aforquilhar para correr filtro externo '%s'" -#: convert.c:685 +#: convert.c:674 #, fuzzy, c-format msgid "cannot feed the input to external filter '%s'" msgstr "incapaz introduzir input para filtro externo '%s'" -#: convert.c:692 +#: convert.c:681 #, fuzzy, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' falhou %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, fuzzy, c-format msgid "external filter '%s' failed" -msgstr "falha ao mudar o nome de '%s'" +msgstr "filtro externo '%s' falhou" -#: convert.c:837 +#: convert.c:826 #, fuzzy msgid "unexpected filter type" -msgstr "fim de ficheiro inesperado" +msgstr "" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, fuzzy, c-format msgid "%s: clean filter '%s' failed" -msgstr "falha ao criar '%s'" +msgstr "" -#: convert.c:1508 +#: convert.c:1490 #, fuzzy, c-format msgid "%s: smudge filter %s failed" msgstr "falha ao atualizar os ficheiros" @@ -3299,7 +3404,7 @@ msgstr "objeto árvore" #: delta-islands.c:334 #, fuzzy, c-format msgid "failed to load island regex for '%s': %s" -msgstr "falha ao abrir '%s': %s" +msgstr "" #: delta-islands.c:390 #, c-format @@ -3311,33 +3416,38 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diff-lib.c:534 +#: diff-merges.c:70 +#, fuzzy, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valor desconhecido '%s' da chave '%s'" + +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "" -#: diff-lib.c:536 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "" -#: diff-lib.c:553 +#: diff-lib.c:576 #, fuzzy msgid "unable to get HEAD" msgstr "incapaz obter HEAD" -#: diff-lib.c:560 +#: diff-lib.c:583 msgid "no merge base found" msgstr "" -#: diff-lib.c:562 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "" -#: diff-no-index.c:238 +#: diff-no-index.c:237 #, fuzzy msgid "git diff --no-index [] " msgstr "git worktree add [] []" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3386,36 +3496,48 @@ msgstr "" "Erros encontrados na variável de configuração 'diff.dirstat':\n" "%s" -#: diff.c:4276 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:4625 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos" -#: diff.c:4628 +#: diff.c:4637 #, fuzzy msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-b, -B e --detach são mutuamente exclusivos" +msgstr "" -#: diff.c:4706 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" + +#: diff.c:4643 +#, fuzzy +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um único especificador de caminho" -#: diff.c:4754 +#: diff.c:4770 #, fuzzy, c-format msgid "invalid --stat value: %s" msgstr "valor de cor inválido: %.*s" -#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, fuzzy, c-format msgid "%s expects a numerical value" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" -#: diff.c:4791 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3424,539 +3546,555 @@ msgstr "" "Falha ao analisar parâmetro da opção --dirstat/-X:\n" "%s" -#: diff.c:4876 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4900 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4914 +#: diff.c:4930 #, fuzzy, c-format msgid "unable to resolve '%s'" msgstr "incapaz resolver '%s'" -#: diff.c:4964 diff.c:4970 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects / form" msgstr "" -#: diff.c:4982 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:5003 +#: diff.c:5019 #, fuzzy, c-format msgid "bad --color-moved argument: %s" msgstr "argumento incorreto --color-moved: %s" -#: diff.c:5022 +#: diff.c:5038 #, fuzzy, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "objeto inválido '%s' fornecido." -#: diff.c:5062 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5098 diff.c:5118 +#: diff.c:5114 diff.c:5134 #, fuzzy, c-format msgid "invalid argument to %s" -msgstr "valor inválido de %s" +msgstr "" -#: diff.c:5222 +#: diff.c:5238 #, fuzzy, c-format msgid "invalid regex given to -I: '%s'" -msgstr "valor inválido de %s" +msgstr "" -#: diff.c:5271 +#: diff.c:5287 #, fuzzy, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'" -#: diff.c:5327 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5350 +#: diff.c:5379 msgid "Diff output format options" msgstr "" -#: diff.c:5352 diff.c:5358 +#: diff.c:5381 diff.c:5387 #, fuzzy msgid "generate patch" msgstr "incorporar o patch" -#: diff.c:5355 builtin/log.c:178 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "suprimir saída do diff" -#: diff.c:5360 diff.c:5474 diff.c:5481 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "" msgstr "" -#: diff.c:5361 diff.c:5364 +#: diff.c:5390 diff.c:5393 #, fuzzy msgid "generate diffs with lines context" msgstr "garantir que, pelo menos, linhas de contexto coincidem" -#: diff.c:5366 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5369 +#: diff.c:5398 #, fuzzy msgid "synonym for '-p --raw'" -msgstr "(sinónimo de --stat)" +msgstr "" -#: diff.c:5373 +#: diff.c:5402 #, fuzzy msgid "synonym for '-p --stat'" -msgstr "(sinónimo de --stat)" +msgstr "" -#: diff.c:5377 +#: diff.c:5406 #, fuzzy msgid "machine friendly --stat" msgstr "saída inteligível por máquina" -#: diff.c:5380 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5382 diff.c:5390 +#: diff.c:5411 diff.c:5419 msgid "..." msgstr "" -#: diff.c:5383 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5387 +#: diff.c:5416 #, fuzzy msgid "synonym for --dirstat=cumulative" -msgstr "sinónimo de --files-with-matches" +msgstr "sinónimo de --dirstat=cumulative" -#: diff.c:5391 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5395 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5398 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5401 -#, fuzzy -msgid "show only names of changed files" -msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" - -#: diff.c:5404 -#, fuzzy -msgid "show only names and status of changed files" -msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" - -#: diff.c:5406 -msgid "[,[,]]" -msgstr "" - -#: diff.c:5407 -#, fuzzy -msgid "generate diffstat" -msgstr "diff status inesperado %c" - -#: diff.c:5409 diff.c:5412 diff.c:5415 -msgid "" -msgstr "" - -#: diff.c:5410 -msgid "generate diffstat with a given width" -msgstr "" - -#: diff.c:5413 -msgid "generate diffstat with a given name width" -msgstr "" - -#: diff.c:5416 -msgid "generate diffstat with a given graph width" -msgstr "" - -#: diff.c:5418 -msgid "" -msgstr "" - -#: diff.c:5419 -msgid "generate diffstat with limited lines" -msgstr "" - -#: diff.c:5422 -msgid "generate compact summary in diffstat" -msgstr "" - -#: diff.c:5425 -msgid "output a binary diff that can be applied" -msgstr "" - -#: diff.c:5428 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "" - #: diff.c:5430 #, fuzzy +msgid "show only names of changed files" +msgstr "" + +#: diff.c:5433 +#, fuzzy +msgid "show only names and status of changed files" +msgstr "" + +#: diff.c:5435 +msgid "[,[,]]" +msgstr "" + +#: diff.c:5436 +#, fuzzy +msgid "generate diffstat" +msgstr "diff status inesperado %c" + +#: diff.c:5438 diff.c:5441 diff.c:5444 +msgid "" +msgstr "" + +#: diff.c:5439 +msgid "generate diffstat with a given width" +msgstr "" + +#: diff.c:5442 +msgid "generate diffstat with a given name width" +msgstr "" + +#: diff.c:5445 +msgid "generate diffstat with a given graph width" +msgstr "" + +#: diff.c:5447 +msgid "" +msgstr "" + +#: diff.c:5448 +msgid "generate diffstat with limited lines" +msgstr "" + +#: diff.c:5451 +msgid "generate compact summary in diffstat" +msgstr "" + +#: diff.c:5454 +msgid "output a binary diff that can be applied" +msgstr "" + +#: diff.c:5457 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "" + +#: diff.c:5459 +#, fuzzy msgid "show colored diff" msgstr "mostrar ficheiros ignorados" -#: diff.c:5431 +#: diff.c:5460 msgid "" msgstr "" -#: diff.c:5432 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5435 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 #, fuzzy msgid "" msgstr "/" -#: diff.c:5439 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5442 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5445 +#: diff.c:5474 #, fuzzy msgid "prepend an additional prefix to every line of output" msgstr "preceder o nomebase do projeto pai na saída" -#: diff.c:5448 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5451 +#: diff.c:5480 #, fuzzy msgid "show context between diff hunks up to the specified number of lines" msgstr "criar um clone raso, truncado ao número especificado de revisões" -#: diff.c:5455 diff.c:5460 diff.c:5465 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "" msgstr "" -#: diff.c:5456 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5461 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5466 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5469 +#: diff.c:5498 #, fuzzy msgid "Diff rename options" -msgstr "Opções genéricas" +msgstr "" -#: diff.c:5470 +#: diff.c:5499 #, fuzzy msgid "[/]" msgstr "[,]" -#: diff.c:5471 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5475 +#: diff.c:5504 #, fuzzy msgid "detect renames" -msgstr "nome do remoto" +msgstr "detetar renomeações" -#: diff.c:5479 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5482 +#: diff.c:5511 msgid "detect copies" msgstr "" -#: diff.c:5486 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5488 +#: diff.c:5517 #, fuzzy msgid "disable rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: diff.c:5491 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5493 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5496 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5498 +#: diff.c:5527 #, fuzzy msgid "Diff algorithm options" -msgstr "opção inválida: %s" +msgstr "" -#: diff.c:5500 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5503 +#: diff.c:5532 #, fuzzy msgid "ignore whitespace when comparing lines" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5506 +#: diff.c:5535 #, fuzzy msgid "ignore changes in amount of whitespace" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5509 +#: diff.c:5538 #, fuzzy msgid "ignore changes in whitespace at EOL" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5512 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5515 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "" msgstr "" -#: diff.c:5518 +#: diff.c:5547 #, fuzzy msgid "ignore changes whose all lines match " -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5521 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5524 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5528 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5530 +#: diff.c:5559 msgid "" msgstr "" -#: diff.c:5531 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5533 +#: diff.c:5562 #, fuzzy msgid "" msgstr "texto" -#: diff.c:5534 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5536 diff.c:5545 diff.c:5548 +#: diff.c:5565 diff.c:5574 diff.c:5577 #, fuzzy msgid "" msgstr "modo" -#: diff.c:5537 +#: diff.c:5566 msgid "show word diff, using to delimit changed words" msgstr "" -#: diff.c:5540 +#: diff.c:5569 msgid "use to decide what a word is" msgstr "" -#: diff.c:5543 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "" -#: diff.c:5546 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5549 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5552 +#: diff.c:5581 #, fuzzy msgid "Other diff options" -msgstr "Opções genéricas" +msgstr "" -#: diff.c:5554 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5558 +#: diff.c:5587 #, fuzzy msgid "treat all files as text" msgstr "processar ficheiros binários como texto" -#: diff.c:5560 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5562 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5564 +#: diff.c:5593 msgid "disable all output of the program" msgstr "" -#: diff.c:5566 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5568 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5570 +#: diff.c:5599 #, fuzzy msgid "" msgstr "quando" -#: diff.c:5571 +#: diff.c:5600 #, fuzzy msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. " "(Predefinição: all)" -#: diff.c:5574 +#: diff.c:5603 #, fuzzy msgid "" msgstr "formato" -#: diff.c:5575 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5579 +#: diff.c:5608 #, fuzzy msgid "hide 'git add -N' entries from the index" -msgstr "usar .gitattributes apenas a partir do índice" +msgstr "" -#: diff.c:5582 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5584 +#: diff.c:5613 #, fuzzy msgid "" msgstr "cadeia" -#: diff.c:5585 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5588 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5591 +#: diff.c:5620 #, fuzzy msgid "show all changes in the changeset with -S or -G" msgstr "mostrar ficheiros com correspondências no paginador" -#: diff.c:5594 +#: diff.c:5623 #, fuzzy msgid "treat in -S as extended POSIX regular expression" msgstr "usar expressões regulares estendidas do POSIX" -#: diff.c:5597 +#: diff.c:5626 #, fuzzy msgid "control the order in which files appear in the output" msgstr "mostrar outros ficheiros na saída" -#: diff.c:5598 +#: diff.c:5627 diff.c:5630 +#, fuzzy +msgid "" +msgstr "path" + +#: diff.c:5628 +#, fuzzy +msgid "show the change in the specified path first" +msgstr "" +"escrever o ficheiro de índice do pacote na versão de formato especificada" + +#: diff.c:5631 +#, fuzzy +msgid "skip the output to the specified path" +msgstr "Repor a HEAD atual no estado especificado" + +#: diff.c:5633 #, fuzzy msgid "" msgstr "objeto" -#: diff.c:5599 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5601 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5602 +#: diff.c:5637 msgid "select files by diff type" msgstr "" -#: diff.c:5604 +#: diff.c:5639 #, fuzzy msgid "" msgstr "ficheiro" -#: diff.c:5605 +#: diff.c:5640 #, fuzzy msgid "Output to a specific file" msgstr "submeter somente os ficheiros especificados" -#: diff.c:6262 -msgid "inexact rename detection was skipped due to too many files." -msgstr "" -"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros." +#: diff.c:6298 +#, fuzzy +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros." -#: diff.c:6265 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "" "só foram encontradas cópias de caminhos modificados devido a demasiados " "ficheiros." -#: diff.c:6268 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3966,67 +4104,72 @@ msgstr "" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "falha ao ler ficheiro de comando '%s'" -#: diffcore-rename.c:592 +#: diffcore-rename.c:1510 msgid "Performing inexact rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: dir.c:578 +#: diffcore-rotate.c:29 +#, fuzzy, c-format +msgid "No such path '%s' in the diff" +msgstr "path %s inexistente em %s" + +#: dir.c:593 #, fuzzy, c-format msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "especificador de path '%s' correspondeu a ficheiro nenhum " -"conhecido pelo git" +msgstr "" +"especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, fuzzy, c-format msgid "unrecognized pattern: '%s'" msgstr "padrão irreconhecível: '%s'" -#: dir.c:777 dir.c:791 +#: dir.c:792 dir.c:806 #, fuzzy, c-format msgid "unrecognized negative pattern: '%s'" msgstr "por reconhecer padrão negativo: '%s'" -#: dir.c:809 +#: dir.c:824 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:819 +#: dir.c:834 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1198 +#: dir.c:1221 #, fuzzy, c-format msgid "cannot use %s as an exclude file" msgstr "incapaz usar %s como ficheiro de exclusão" -#: dir.c:2305 +#: dir.c:2358 #, fuzzy, c-format msgid "could not open directory '%s'" msgstr "incapaz abrir pasta '%s'" -#: dir.c:2605 +#: dir.c:2660 msgid "failed to get kernel name and information" msgstr "falha ao obter nome e informação do kernel" -#: dir.c:2729 +#: dir.c:2784 #, fuzzy msgid "untracked cache is disabled on this system or location" msgstr "cache untracked está desativada neste sistema ou localização." -#: dir.c:3520 +#: dir.c:3617 #, fuzzy, c-format msgid "index file corrupt in repo %s" -msgstr "ficheiro de índice corrompido" +msgstr "" -#: dir.c:3565 dir.c:3570 +#: dir.c:3664 dir.c:3669 #, c-format msgid "could not create directories for %s" msgstr "incapaz criar pasta para %s" -#: dir.c:3599 +#: dir.c:3698 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "incapaz migrar pasta git de '%s' para '%s'" @@ -4036,22 +4179,22 @@ msgstr "incapaz migrar pasta git de '%s' para '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:177 +#: entry.c:176 #, fuzzy msgid "Filtering content" msgstr "imprimir conteúdo da tag" -#: entry.c:478 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" -msgstr "incapaz obter estatutário de ficheiro '%s'" +msgstr "incapaz de stat o ficheiro '%s'" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:337 +#: environment.c:335 #, fuzzy, c-format msgid "could not set GIT_DIR to '%s'" msgstr "incapaz definir GIT_DIR para '%s'" @@ -4059,295 +4202,309 @@ msgstr "incapaz definir GIT_DIR para '%s'" #: exec-cmd.c:363 #, fuzzy, c-format msgid "too many args to run %s" -msgstr "Demasiados argumentos." +msgstr "" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack: esperava-se lista rasa" +msgstr "git fetch-pack: esperado lista rasa" -#: fetch-pack.c:180 +#: fetch-pack.c:185 #, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack: esperava-se lista rasa" +msgstr "git fetch-pack: esperado pacote flush após lista rasa" -#: fetch-pack.c:191 +#: fetch-pack.c:196 #, fuzzy msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:222 +#: fetch-pack.c:227 #, fuzzy msgid "unable to write to remote" msgstr "incapaz escrever para remoto" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requer multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1406 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "linha rasa inválida: %s" -#: fetch-pack.c:384 fetch-pack.c:1412 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" -msgstr "linha para aprofundar inválida: %s" +msgstr "linha por aprofundar inválida: %s" -#: fetch-pack.c:386 fetch-pack.c:1414 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "objeto perdido: %s" -#: fetch-pack.c:389 fetch-pack.c:1417 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "erro no objeto: %s" -#: fetch-pack.c:391 fetch-pack.c:1419 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" -msgstr "shallow perdido: %s" +msgstr "shallow por encontrar: %s" -#: fetch-pack.c:394 fetch-pack.c:1423 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" -msgstr "esperava-se raso/aprofundar, obteve-se %s" +msgstr "esperado shallow/unshallow, recebi %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "obteve-se %s %d %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" -msgstr "desistência" +msgstr "a desistir" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "concluído" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "obteve-se %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "Marcado %s como completo" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "já se tem %s (%s)" -#: fetch-pack.c:827 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband" -#: fetch-pack.c:835 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: fetch-pack.c:919 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: incapaz de aforquilhar %s" -#: fetch-pack.c:937 +#: fetch-pack.c:957 +msgid "fetch-pack: invalid index-pack output" +msgstr "" + +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s falhou" -#: fetch-pack.c:939 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "erro em demultiplexer sideband" -#: fetch-pack.c:982 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "A versão do servidor é %.*s" -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, fuzzy, c-format msgid "Server supports %s" msgstr "O servidor suporta side-band" -#: fetch-pack.c:992 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "Servidor insustenta clientes shallow" -#: fetch-pack.c:1052 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "Servidor insustenta --shallow-since" -#: fetch-pack.c:1057 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "Servidor insustenta --shallow-exclude" -#: fetch-pack.c:1061 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "Servidor insustenta --deepen" -#: fetch-pack.c:1063 +#: fetch-pack.c:1100 #, fuzzy msgid "Server does not support this repository's object format" msgstr "Servidor insustenta formato de objeto deste repositório" -#: fetch-pack.c:1076 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "commits comuns nenhuns" -#: fetch-pack.c:1088 fetch-pack.c:1628 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +#, fuzzy +msgid "source repository is shallow, reject to clone." +msgstr "o repositório de origem é raso, --local ignorado" + +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: falha ao obter." -#: fetch-pack.c:1214 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1218 +#: fetch-pack.c:1246 #, fuzzy, c-format msgid "the server does not support algorithm '%s'" msgstr "o servidor insustenta algoritmo '%s'" -#: fetch-pack.c:1238 +#: fetch-pack.c:1279 #, fuzzy msgid "Server does not support shallow requests" msgstr "Servidor insustenta pedidos shallow" -#: fetch-pack.c:1245 +#: fetch-pack.c:1286 #, fuzzy msgid "Server supports filter" msgstr "Servidor sustenta filtro" -#: fetch-pack.c:1284 +#: fetch-pack.c:1329 fetch-pack.c:2043 #, fuzzy msgid "unable to write request to remote" msgstr "incapaz escrever pedidos para remoto" -#: fetch-pack.c:1302 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1308 +#: fetch-pack.c:1353 #, fuzzy, c-format msgid "expected '%s', received '%s'" -msgstr "blob para %s '%s' esperado" +msgstr "" -#: fetch-pack.c:1369 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1374 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1384 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1386 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1428 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1475 +#: fetch-pack.c:1494 #, fuzzy, c-format msgid "expected wanted-ref, got '%s'" -msgstr "esperava-se raso/aprofundar, obteve-se %s" +msgstr "" -#: fetch-pack.c:1480 +#: fetch-pack.c:1499 #, fuzzy, c-format msgid "unexpected wanted-ref: '%s'" -msgstr "fim de ficheiro inesperado" +msgstr "" -#: fetch-pack.c:1485 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1515 +#: fetch-pack.c:1534 #, fuzzy msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack: esperava-se lista rasa" +msgstr "git fetch-pack: esperado pacote fim de resposta" -#: fetch-pack.c:1897 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "corresponde a remote head nenhuma" -#: fetch-pack.c:1920 builtin/clone.c:693 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "remoto faltou enviar todos objetos necessários" -#: fetch-pack.c:1947 +#: fetch-pack.c:2065 +#, fuzzy +msgid "unexpected 'ready' from remote" +msgstr "" + +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "referência remota %s inexistente" -#: fetch-pack.c:1950 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servidor proíbe pedido de objeto por anunciar %s" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "incapaz criar ficheiro temporário" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falha ao escrever assinatura destacada em '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg falhou assinar os dados" #: graph.c:98 -#, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +#, fuzzy, c-format +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "ignorar cor inválida '%.*s' em log.graphColors" -#: grep.c:640 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:2100 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': incapaz ler %s" -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 -#: builtin/rm.c:135 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" -msgstr "falha ao invocar stat de '%s'" +msgstr "" -#: grep.c:2128 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s': leitura truncada" @@ -4417,7 +4574,7 @@ msgstr "comandos do git disponíveis noutras localizações em $PATH" msgid "These are common Git commands used in various situations:" msgstr "Estes são comandos do Git comuns usados em diversas situações:" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, fuzzy, c-format msgid "unsupported command listing type '%s'" msgstr "insustento para listagem tipo comandos '%s'" @@ -4569,47 +4726,52 @@ msgstr "nome de identação vazio (para <%s>) proíbido" msgid "name consists only of disallowed characters: %s" msgstr "nome consiste apenas de caracteres proíbidos: %s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "formato de data inválido: %s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:'" msgstr "" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, fuzzy, c-format +msgid "'%s' for 'object:type=' is not a valid object type" +msgstr "'%s' para 'object:type=' é um tipo de objecto inválido" + +#: list-objects-filter-options.c:124 #, fuzzy, c-format msgid "invalid filter-spec '%s'" -msgstr "ficheiro inválido: '%s'" +msgstr "" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, fuzzy, c-format msgid "unable to access sparse blob in '%s'" msgstr "incapaz acessar blob sparse em '%s'" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, fuzzy, c-format msgid "unable to parse sparse filter data in %s" msgstr "incapaz analisar dados de filtro sparse em %s" @@ -4624,7 +4786,7 @@ msgstr "" msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:375 +#: list-objects.c:398 #, fuzzy, c-format msgid "unable to load root tree for commit %s" msgstr "incapaz carregar raiz de árvore para commit %s" @@ -4653,123 +4815,57 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Incapaz de criar '%s.lock': %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, fuzzy, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3672 -#, fuzzy, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" +#: mailinfo.c:1050 +msgid "quoted CRLF detected" msgstr "" -"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " -"integrar:\n" -"%%s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 #, fuzzy, c-format -msgid "Already up to date!" -msgstr "Já está atualizado!" +msgid "bad action '%s' for '%s'" +msgstr "ação inválida '%s' para '%s'" -#: merge-recursive.c:356 -msgid "(bad commit)\n" -msgstr "(commit incorreto)\n" - -#: merge-recursive.c:379 -#, fuzzy, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "addinfo_cache falhou no caminho '%s'" - -#: merge-recursive.c:388 -#, fuzzy, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "addinfo_cache falhou no caminho '%s'" - -#: merge-recursive.c:874 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "falha ao criar o caminho '%s'%s" - -#: merge-recursive.c:885 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "A remover %s para criar espaço para o subdiretório\n" - -#: merge-recursive.c:899 merge-recursive.c:918 -msgid ": perhaps a D/F conflict?" -msgstr ": talvez um conflito D/F?" - -#: merge-recursive.c:908 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "recusando perder ficheiro untracked em '%s'" - -#: merge-recursive.c:949 builtin/cat-file.c:41 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "incapaz ler objeto %s '%s'" - -#: merge-recursive.c:954 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "blob para %s '%s' esperado" - -#: merge-recursive.c:979 -#, c-format -msgid "failed to open '%s': %s" -msgstr "falha ao abrir '%s': %s" - -#: merge-recursive.c:990 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "falha ao criar a ligação simbólica '%s': %s" - -#: merge-recursive.c:995 -#, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "desconheço que fazer com %06o %s '%s'" - -#: merge-recursive.c:1191 +#: merge-ort.c:1228 merge-recursive.c:1206 #, fuzzy, c-format msgid "Failed to merge submodule %s (not checked out)" -msgstr "Falha ao registar o submódulo '$sm_path'" +msgstr "" -#: merge-recursive.c:1198 +#: merge-ort.c:1237 merge-recursive.c:1213 #, fuzzy, c-format msgid "Failed to merge submodule %s (commits not present)" -msgstr "Falha ao registar o submódulo '$sm_path'" +msgstr "" -#: merge-recursive.c:1205 +#: merge-ort.c:1246 merge-recursive.c:1220 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1213 merge-recursive.c:1225 -#, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "" - -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-ort.c:1256 merge-ort.c:1263 #, fuzzy, c-format -msgid "Fast-forwarding submodule %s" -msgstr "Avanço-rápido para $sha1" - -#: merge-recursive.c:1251 -#, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" +msgid "Note: Fast-forwarding submodule %s to %s" msgstr "" -#: merge-recursive.c:1255 +#: merge-ort.c:1284 #, fuzzy, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "Falha ao registar o submódulo '$sm_path'" +msgid "Failed to merge submodule %s" +msgstr "falha a percorrer recursivamente dentro de submódulo '%s'" -#: merge-recursive.c:1256 -msgid "Found a possible merge resolution for the submodule:\n" +#: merge-ort.c:1291 +#, fuzzy, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" msgstr "" -#: merge-recursive.c:1259 +#: merge-ort.c:1295 merge-recursive.c:1274 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4780,32 +4876,287 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1268 -#, c-format -msgid "Failed to merge submodule %s (multiple merges found)" +#: merge-ort.c:1308 +#, fuzzy, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" msgstr "" -#: merge-recursive.c:1341 +#: merge-ort.c:1527 merge-recursive.c:1363 msgid "Failed to execute internal merge" msgstr "Falha ao executar integração interna" -#: merge-recursive.c:1346 +#: merge-ort.c:1532 merge-recursive.c:1368 #, c-format msgid "Unable to add %s to database" msgstr "Incapaz de adicionar %s à base de dados" -#: merge-recursive.c:1378 +#: merge-ort.c:1539 merge-recursive.c:1401 #, c-format msgid "Auto-merging %s" msgstr "A integrar automaticamente %s" -#: merge-recursive.c:1402 +#: merge-ort.c:1678 merge-recursive.c:2123 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#: merge-ort.c:1688 merge-recursive.c:2133 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#: merge-ort.c:1746 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" + +#: merge-ort.c:1900 merge-recursive.c:2469 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-ort.c:2044 merge-recursive.c:3252 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" + +#: merge-ort.c:2051 merge-recursive.c:3259 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" + +#: merge-ort.c:2064 merge-recursive.c:3255 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" + +#: merge-ort.c:2072 merge-recursive.c:3262 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" + +#: merge-ort.c:2228 +#, fuzzy, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " +"%s->%s em %s" + +#: merge-ort.c:2323 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" + +#: merge-ort.c:2342 merge-ort.c:2366 +#, fuzzy, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em " +"%s" + +#: merge-ort.c:2819 merge-recursive.c:3013 +#, c-format +msgid "cannot read object %s" +msgstr "incapaz ler objeto %s" + +#: merge-ort.c:2822 merge-recursive.c:3016 +#, c-format +msgid "object %s is not a blob" +msgstr "objeto %s é blob nenhum" + +#: merge-ort.c:3250 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" + +#: merge-ort.c:3326 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed both " +"of them so each can be recorded somewhere." +msgstr "" + +#: merge-ort.c:3333 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" + +#: merge-ort.c:3433 merge-recursive.c:3092 +msgid "content" +msgstr "conteúdo" + +#: merge-ort.c:3435 merge-recursive.c:3096 +msgid "add/add" +msgstr "adicionar/adicionar" + +#: merge-ort.c:3437 merge-recursive.c:3141 +msgid "submodule" +msgstr "submódulo" + +#: merge-ort.c:3439 merge-recursive.c:3142 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLITO (%s): conflito de integração em %s" + +#: merge-ort.c:3470 +#, fuzzy, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s " +"deixada na árvore." + +#: merge-ort.c:3757 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:4116 +#, fuzzy, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3707 +#, fuzzy, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " +"integrar:\n" +"%%s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#, fuzzy +msgid "Already up to date." +msgstr "Já está atualizado." + +#: merge-recursive.c:357 +msgid "(bad commit)\n" +msgstr "(commit incorreto)\n" + +#: merge-recursive.c:380 +#, fuzzy, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." +msgstr "addinfo_cache falhou no caminho '%s'" + +#: merge-recursive.c:389 +#, fuzzy, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "addinfo_cache falhou no caminho '%s'" + +#: merge-recursive.c:877 +#, c-format +msgid "failed to create path '%s'%s" +msgstr "falha ao criar o caminho '%s'%s" + +#: merge-recursive.c:888 +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "A remover %s para criar espaço para o subdiretório\n" + +#: merge-recursive.c:902 merge-recursive.c:921 +msgid ": perhaps a D/F conflict?" +msgstr ": talvez um conflito D/F?" + +#: merge-recursive.c:911 +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "recusando perder ficheiro untracked em '%s'" + +#: merge-recursive.c:952 builtin/cat-file.c:41 +#, c-format +msgid "cannot read object %s '%s'" +msgstr "incapaz ler objeto %s '%s'" + +#: merge-recursive.c:957 +#, c-format +msgid "blob expected for %s '%s'" +msgstr "" + +#: merge-recursive.c:982 +#, c-format +msgid "failed to open '%s': %s" +msgstr "falhou ao abrir '%s': %s" + +#: merge-recursive.c:993 +#, c-format +msgid "failed to symlink '%s': %s" +msgstr "falha ao criar a ligação simbólica '%s': %s" + +#: merge-recursive.c:998 +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "desconheço que fazer com %06o %s '%s'" + +#: merge-recursive.c:1228 merge-recursive.c:1240 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "" + +#: merge-recursive.c:1231 merge-recursive.c:1243 +#, fuzzy, c-format +msgid "Fast-forwarding submodule %s" +msgstr "Avançando submódulo %s" + +#: merge-recursive.c:1266 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "" + +#: merge-recursive.c:1270 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "" + +#: merge-recursive.c:1271 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "" + +#: merge-recursive.c:1283 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" + +#: merge-recursive.c:1425 #, fuzzy, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "Erro: Recusando perder ficheiro untracked de '%s'; escrevendo " -"invés para %s" +msgstr "" +"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s" -#: merge-recursive.c:1474 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4814,7 +5165,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s " "deixada na árvore." -#: merge-recursive.c:1479 +#: merge-recursive.c:1502 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4823,7 +5174,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s " "de %s deixada na árvore." -#: merge-recursive.c:1486 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4832,7 +5183,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s " "deixada na árvore em %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1514 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4841,44 +5192,43 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s " "de %s deixada na árvore em %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1549 msgid "rename" msgstr "mudar nome" -#: merge-recursive.c:1526 +#: merge-recursive.c:1549 msgid "renamed" msgstr "nome mudado" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 #, fuzzy, c-format msgid "Refusing to lose dirty file at %s" msgstr "Recusando perder ficheiro sujo de %s" -#: merge-recursive.c:1587 +#: merge-recursive.c:1610 #, fuzzy, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "Recusando perder ficheiro untracked de %s, apesar de este estar " -"no caminho." +msgstr "" +"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho." -#: merge-recursive.c:1645 +#: merge-recursive.c:1668 #, fuzzy, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em " "%s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1699 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s é um diretório em %s adicionando %s no seu lugar" -#: merge-recursive.c:1681 +#: merge-recursive.c:1704 #, fuzzy, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s " -"invés" +msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés" -#: merge-recursive.c:1708 +#: merge-recursive.c:1731 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4887,18 +5237,18 @@ msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" " "mudar o nome \"%s\"->\"%s\" em \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1736 msgid " (left unresolved)" msgstr " (por resolver)" -#: merge-recursive.c:1805 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " "%s->%s em %s" -#: merge-recursive.c:2068 +#: merge-recursive.c:2091 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4906,21 +5256,7 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" - -#: merge-recursive.c:2202 +#: merge-recursive.c:2225 #, fuzzy, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4929,141 +5265,80 @@ msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " "%s->%s em %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" - -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "incapaz ler objeto %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "objeto %s é blob nenhum" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3080 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3040 +#: merge-recursive.c:3080 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3052 -msgid "content" -msgstr "conteúdo" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "adicionar/adicionar" - -#: merge-recursive.c:3079 +#: merge-recursive.c:3119 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ignorado (integrado é igual ao existente)" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "submódulo" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLITO (%s): conflito de integração em %s" - -#: merge-recursive.c:3132 +#: merge-recursive.c:3172 #, c-format msgid "Adding as %s instead" msgstr "A adicionar como %s, em alternativa." -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" - -#: merge-recursive.c:3339 +#: merge-recursive.c:3376 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3399 msgid "file/directory" msgstr "ficheiro/diretório" -#: merge-recursive.c:3367 +#: merge-recursive.c:3404 msgid "directory/file" msgstr "diretório/ficheiro" -#: merge-recursive.c:3374 +#: merge-recursive.c:3411 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s" -#: merge-recursive.c:3383 +#: merge-recursive.c:3420 #, c-format msgid "Adding %s" msgstr "A adicionar %s" -#: merge-recursive.c:3392 +#: merge-recursive.c:3429 #, fuzzy, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITO (%s): conflito de integração em %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3482 #, c-format msgid "merging of trees %s and %s failed" msgstr "falha ao integrar as árvores %s e %s" -#: merge-recursive.c:3550 +#: merge-recursive.c:3576 msgid "Merging:" msgstr "A integrar:" -#: merge-recursive.c:3563 +#: merge-recursive.c:3589 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u antecessor comum encontrado:" msgstr[1] "%u antecessores comuns encontrados:" -#: merge-recursive.c:3613 +#: merge-recursive.c:3639 msgid "merge returned no commit" msgstr "junção retornou commit nenhum" -#: merge-recursive.c:3769 +#: merge-recursive.c:3804 #, c-format msgid "Could not parse object '%s'" msgstr "Incapaz de analisar objeto '%s'" -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "Incapaz de escrever no index." @@ -5071,190 +5346,211 @@ msgstr "Incapaz de escrever no index." msgid "failed to read the cache" msgstr "falha ao ler a cache" -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "incapaz escrever novo ficheiro index" -#: midx.c:80 +#: midx.c:74 +#, fuzzy +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "versão %d de multi-pack-index é irreconhecível" + +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:96 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:101 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" -msgstr "" +msgstr "versão %d de multi-pack-index é irreconhecível" -#: midx.c:106 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:123 -msgid "invalid chunk offset (too large)" -msgstr "" - -#: midx.c:147 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "" - -#: midx.c:160 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:162 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:164 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:166 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:180 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:223 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:273 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:480 +#: midx.c:490 #, fuzzy, c-format msgid "failed to add packfile '%s'" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "" -#: midx.c:486 +#: midx.c:496 #, fuzzy, c-format msgid "failed to open pack-index '%s'" -msgstr "falha ao abrir '%s'" +msgstr "" -#: midx.c:546 +#: midx.c:564 #, fuzzy, c-format msgid "failed to locate object %d in packfile" -msgstr "Falha ao criar os ficheiros de saída" +msgstr "" -#: midx.c:846 +#: midx.c:880 builtin/index-pack.c:1533 +#, fuzzy +msgid "cannot store reverse index file" +msgstr "incapaz guardar ficheiro index" + +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "ignorando multi-pack-index existente; checksum diferente" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:879 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:931 +#: midx.c:1034 +#, fuzzy, c-format +msgid "unknown preferred pack: '%s'" +msgstr "" + +#: midx.c:1039 +#, fuzzy, c-format +msgid "preferred pack '%s' is expired" +msgstr "o repositório de referência '%s' está enxertado" + +#: midx.c:1055 #, fuzzy msgid "no pack files to index." msgstr "pack files nenhuns para index." -#: midx.c:982 -msgid "Writing chunks to multi-pack-index" -msgstr "" +#: midx.c:1135 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "falha ao remover %s" -#: midx.c:1060 +#: midx.c:1166 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" -msgstr "falha ao limpar o índice" +msgstr "" -#: midx.c:1116 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1124 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "checksum incorreto" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1139 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" -#: midx.c:1144 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "" -#: midx.c:1153 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1162 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1182 +#: midx.c:1294 #, fuzzy msgid "Sorting objects by packfile" -msgstr "A escrever objetos" +msgstr "" -#: midx.c:1189 +#: midx.c:1301 #, fuzzy msgid "Verifying object offsets" -msgstr "A escrever objetos" +msgstr "" -#: midx.c:1205 +#: midx.c:1317 #, fuzzy, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "falhou carregar entrada pack para oid[%d] = %s" -#: midx.c:1211 +#: midx.c:1323 #, fuzzy, c-format msgid "failed to load pack-index for packfile %s" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "" -#: midx.c:1220 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" -#: midx.c:1245 +#: midx.c:1357 #, fuzzy msgid "Counting referenced objects" msgstr "Contando objetos referenciados" -#: midx.c:1255 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1446 +#: midx.c:1558 #, fuzzy msgid "could not start pack-objects" msgstr "incapaz de começar pack-objects" -#: midx.c:1466 +#: midx.c:1578 #, fuzzy msgid "could not finish pack-objects" msgstr "incapaz de terminar pack-objects" -#: name-hash.c:537 +#: name-hash.c:542 #, fuzzy, c-format msgid "unable to create lazy_dir thread: %s" msgstr "incapaz criar thread lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:564 #, fuzzy, c-format msgid "unable to create lazy_name thread: %s" msgstr "incapaz criar thread lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:570 #, fuzzy, c-format msgid "unable to join lazy_name thread: %s" msgstr "incapaz juntar a thread lazy_name: %s" @@ -5268,7 +5564,8 @@ msgid "" msgstr "" "Ficou por concluír a anterior junção de notas (%s existe).\n" "Por favor, usa 'git notes merge --commit' ou 'git notes merge --abort' para " -"commitar/abortar a junção anterior antes de começares uma nova junção de notas." +"commitar/abortar a junção anterior antes de começares uma nova junção de " +"notas." #: notes-merge.c:284 #, c-format @@ -5277,7 +5574,8 @@ msgstr "Ficou por concluír a tua junção de notas (%s existe)." #: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "Impossível commit notas de árvore que estejam por iniciar/por referênciar" +msgstr "" +"Impossível commit notas de árvore que estejam por iniciar/por referênciar" #: notes-utils.c:105 #, c-format @@ -5298,6 +5596,367 @@ msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada" msgid "Bad %s value: '%s'" msgstr "Valor incorreto de %s: '%s'" +#: object-file.c:526 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: object-file.c:584 +#, fuzzy, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "incapaz normalizar path de objeto alternativo: %s" + +#: object-file.c:658 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: object-file.c:665 +#, fuzzy, c-format +msgid "unable to normalize object directory: %s" +msgstr "incapaz normalizar pasta de objeto: %s" + +#: object-file.c:708 +#, fuzzy +msgid "unable to fdopen alternates lockfile" +msgstr "incapaz de fdopen lockfile alternativo" + +#: object-file.c:726 +#, fuzzy +msgid "unable to read alternates file" +msgstr "incapaz ler ficheiro alternativo" + +#: object-file.c:733 +#, fuzzy +msgid "unable to move new alternates file into place" +msgstr "incapaz mover novo ficheiro alternativo para o sítio" + +#: object-file.c:768 +#, c-format +msgid "path '%s' does not exist" +msgstr "caminho '%s' é inexistente" + +#: object-file.c:789 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"repositório referência '%s' como uma checkout ligada ainda é insustentado." + +#: object-file.c:795 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "repositório referência '%s' é repositório local nenhum." + +#: object-file.c:801 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "o repositório de referência '%s' é raso" + +#: object-file.c:809 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "o repositório de referência '%s' está enxertado" + +#: object-file.c:869 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: object-file.c:1019 +#, c-format +msgid "attempting to mmap % over limit %" +msgstr "" + +#: object-file.c:1054 +#, fuzzy, c-format +msgid "mmap failed%s" +msgstr "mmap falhou%s" + +#: object-file.c:1218 +#, fuzzy, c-format +msgid "object file %s is empty" +msgstr "" + +#: object-file.c:1353 object-file.c:2548 +#, fuzzy, c-format +msgid "corrupt loose object '%s'" +msgstr "objeto solto '%s' corrupto" + +#: object-file.c:1355 object-file.c:2552 +#, fuzzy, c-format +msgid "garbage at end of loose object '%s'" +msgstr "lixo no fim de objeto solto '%s'" + +#: object-file.c:1397 +#, fuzzy +msgid "invalid object type" +msgstr "tipo de objeto incorreto." + +#: object-file.c:1481 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: object-file.c:1484 +#, fuzzy, c-format +msgid "unable to unpack %s header" +msgstr "incapaz desempacotar cabeçalho %s" + +#: object-file.c:1490 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: object-file.c:1493 +#, fuzzy, c-format +msgid "unable to parse %s header" +msgstr "incapaz processar cabeçalho %s" + +#: object-file.c:1717 +#, fuzzy, c-format +msgid "failed to read object %s" +msgstr "falha ao ler o objeto '%s'." + +#: object-file.c:1721 +#, fuzzy, c-format +msgid "replacement %s not found for %s" +msgstr "%s substituto, por encontrar para %s" + +#: object-file.c:1725 +#, fuzzy, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "" + +#: object-file.c:1729 +#, fuzzy, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "" + +#: object-file.c:1834 +#, fuzzy, c-format +msgid "unable to write file %s" +msgstr "incapaz escrever ficheiro %s" + +#: object-file.c:1841 +#, fuzzy, c-format +msgid "unable to set permission to '%s'" +msgstr "incapaz definir permissão para '%s'" + +#: object-file.c:1848 +#, fuzzy +msgid "file write error" +msgstr "" + +#: object-file.c:1868 +#, fuzzy +msgid "error when closing loose object file" +msgstr "" + +#: object-file.c:1933 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: object-file.c:1935 +#, fuzzy +msgid "unable to create temporary file" +msgstr "incapaz criar ficheiro temporário" + +#: object-file.c:1959 +#, fuzzy +msgid "unable to write loose object file" +msgstr "incapaz escrever ficheiro objeto solto" + +#: object-file.c:1965 +#, fuzzy, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "incapaz esvaziar objeto novo %s (%d)" + +#: object-file.c:1969 +#, fuzzy, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "deflateEnd em objeto %s falhou (%d)" + +#: object-file.c:1973 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: object-file.c:1983 builtin/pack-objects.c:1237 +#, fuzzy, c-format +msgid "failed utime() on %s" +msgstr "" + +#: object-file.c:2060 +#, fuzzy, c-format +msgid "cannot read object for %s" +msgstr "incapaz ler objeto para %s" + +#: object-file.c:2111 +#, fuzzy +msgid "corrupt commit" +msgstr "substituir autor do commit" + +#: object-file.c:2119 +#, fuzzy +msgid "corrupt tag" +msgstr "mostrar tags" + +#: object-file.c:2219 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: object-file.c:2222 +#, fuzzy, c-format +msgid "short read while indexing %s" +msgstr "leitura curta enquanto indexando %s" + +#: object-file.c:2295 object-file.c:2305 +#, fuzzy, c-format +msgid "%s: failed to insert into database" +msgstr "%s: falhou inserir na base de dados" + +#: object-file.c:2311 +#, fuzzy, c-format +msgid "%s: unsupported file type" +msgstr "%s: tipo ficheiro insustentado" + +#: object-file.c:2335 +#, fuzzy, c-format +msgid "%s is not a valid object" +msgstr "%s é objeto inválido" + +#: object-file.c:2337 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s é um objeto inválido '%s'" + +#: object-file.c:2364 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "incapaz abrir %s" + +#: object-file.c:2559 object-file.c:2612 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "" + +#: object-file.c:2583 +#, fuzzy, c-format +msgid "unable to mmap %s" +msgstr "incapaz mmap %s" + +#: object-file.c:2588 +#, fuzzy, c-format +msgid "unable to unpack header of %s" +msgstr "incapaz desempacotar cabeçalho de %s" + +#: object-file.c:2594 +#, fuzzy, c-format +msgid "unable to parse header of %s" +msgstr "incapaz processar cabeçalho de %s" + +#: object-file.c:2605 +#, fuzzy, c-format +msgid "unable to unpack contents of %s" +msgstr "incapaz desempacotar conteúdo de %s" + +#: object-name.c:480 +#, fuzzy, c-format +msgid "short object ID %s is ambiguous" +msgstr "SHA1 curto %s é ambíguo" + +#: object-name.c:491 +msgid "The candidates are:" +msgstr "Os candidatos são:" + +#: object-name.c:790 +#, fuzzy +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Normalmente o Git nunca cria refs que terminem em 40 caracteres\n" +"hexadecimais, porque será ignorada quando apenas se indica 40-hex.\n" +"Poderam-se criar estas refs por engano. Como no exemplo,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"onde \"$br\" fica vazio e uma ref de 40-hex é criada. Por favor\n" +"examine estas refs e talvez apague-as. Desative esta mensagem\n" +"executando \"git config advice.objectNameWarning false\"" + +#: object-name.c:910 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "" + +#: object-name.c:918 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "" + +#: object-name.c:1696 +#, fuzzy, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "O caminho '%s' está dentro do submódulo '%.*s'" + +#: object-name.c:1702 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: object-name.c:1711 +#, fuzzy, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "caminho '%s' é inexistente em '%.*s'" + +#: object-name.c:1739 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" + +#: object-name.c:1755 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" + +#: object-name.c:1763 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: object-name.c:1765 +#, fuzzy, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "caminho '%s' é inexistente (quer no disco quer no index)" + +#: object-name.c:1778 +#, fuzzy +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"Os caminhos relativos só podem ser usados a partir do topo da árvore de " +"trabalho" + +#: object-name.c:1916 +#, fuzzy, c-format +msgid "invalid object name '%.*s'." +msgstr "Nome de objeto inválido: '%s'." + #: object.c:53 #, fuzzy, c-format msgid "invalid object type \"%s\"" @@ -5308,36 +5967,91 @@ msgstr "objeto blob inválido %s" msgid "object %s is a %s, not a %s" msgstr "objeto %s é %s, é %s nenhum(a)" -#: object.c:233 +#: object.c:250 #, fuzzy, c-format msgid "object %s has unknown type id %d" -msgstr "objeto de tipo desconhecido" +msgstr "" -#: object.c:246 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "incapaz analisar objeto: %s" -#: object.c:266 object.c:278 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, fuzzy, c-format msgid "unable to get size of %s" msgstr "incapaz obter tamanho de %s" -#: packfile.c:615 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 +#, fuzzy, c-format +msgid "unable to get disk usage of %s" +msgstr "incapaz obter tamanho de %s" + +#: pack-revindex.c:221 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "" + +#: pack-revindex.c:226 +#, fuzzy, c-format +msgid "reverse-index file %s is corrupt" +msgstr "" + +#: pack-revindex.c:234 +#, fuzzy, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "" + +#: pack-revindex.c:238 +#, c-format +msgid "reverse-index file %s has unsupported version %" +msgstr "" + +#: pack-revindex.c:243 +#, c-format +msgid "reverse-index file %s has unsupported hash id %" +msgstr "" + +#: pack-write.c:250 +#, fuzzy +msgid "cannot both write and verify reverse index" +msgstr "incapaz ler o index" + +#: pack-write.c:271 +#, fuzzy, c-format +msgid "could not stat: %s" +msgstr "incapaz obter estatutário %s" + +#: pack-write.c:283 +#, fuzzy, c-format +msgid "failed to make %s readable" +msgstr "falha a analisar %s" + +#: pack-write.c:522 +#, fuzzy, c-format +msgid "could not write '%s' promisor file" +msgstr "incapaz escrever ficheiro promissor '%s'" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" -#: packfile.c:1907 +#: packfile.c:655 +#, fuzzy, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "ficheiro-pacote %s incapaz ser mapeado%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset antes do início do índice do pacote %s (índice corrompido?)" -#: packfile.c:1911 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" @@ -5345,12 +6059,12 @@ msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" #: parse-options-cb.c:20 parse-options-cb.c:24 #, fuzzy, c-format msgid "option `%s' expects a numerical value" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" #: parse-options-cb.c:41 #, fuzzy, c-format msgid "malformed expiration date '%s'" -msgstr "folha de opções malformada: '%s'" +msgstr "data de prazo de validade malformada '%s'" #: parse-options-cb.c:54 #, c-format @@ -5370,12 +6084,12 @@ msgstr "a opção '%s' requer um valor" #: parse-options.c:73 #, fuzzy, c-format msgid "%s is incompatible with %s" -msgstr "--long é incompatível com --abbrev=0" +msgstr "%s é incompatível com %s" #: parse-options.c:78 #, fuzzy, c-format msgid "%s : incompatible with something else" -msgstr "--dirty é incompatível com commits ou semelhantes" +msgstr "" #: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, fuzzy, c-format @@ -5402,31 +6116,31 @@ msgstr "" msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options.c:862 +#: parse-options.c:879 #, fuzzy, c-format msgid "unknown option `%s'" -msgstr "opção desconhecido %s" +msgstr "" -#: parse-options.c:864 +#: parse-options.c:881 #, fuzzy, c-format msgid "unknown switch `%c'" -msgstr "opção desconhecido %s" +msgstr "" -#: parse-options.c:866 +#: parse-options.c:883 #, fuzzy, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "Definidição --confirm desconhecida: '%s'" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "utilização: %s" @@ -5434,17 +6148,17 @@ msgstr "utilização: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " ou: %s" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-NUM" @@ -5453,30 +6167,30 @@ msgstr "-NUM" msgid "Could not make %s writable by group" msgstr "Incapaz de fazer %s escrevível ao grupo" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Carácter de escape '\\' é proíbido como último carácter no valor attr" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "Só se pode especificar um 'attr:'." -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "attr spec tem de ter algum conteúdo" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "nome de atributo inválido %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "as definições globais 'glob' e 'noglob' de especificador de caminho " "(pathspec) são incompatíveis" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5484,51 +6198,51 @@ msgstr "" "a definição global de especificador de caminho 'literal' é incompatível com " "todas as outras definições globais de especificador de caminho (pathspec)" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Por implementar, magic pathspec '%c' em '%s'" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' e 'glob' são incompatíveis" -#: pathspec.c:445 +#: pathspec.c:466 #, fuzzy, c-format msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: '%s' está fora do repositório" +msgstr "%s: '%s' está fora do repositório em '%s'" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnemónica: '%c')" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec insustentado por este comando: %s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -5545,15 +6259,15 @@ msgstr "incapaz escrever pacote delim" #: pkt-line.c:106 #, fuzzy -msgid "unable to write stateless separator packet" -msgstr "incapaz escrever pacote de separador sem estado" +msgid "unable to write response end packet" +msgstr "incapaz escrever pacote fim de resposta" #: pkt-line.c:113 #, fuzzy msgid "flush packet write failed" msgstr "escrita de pacote flush falhou" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "" @@ -5562,158 +6276,168 @@ msgstr "" msgid "packet write with format failed" msgstr "escrita de pacote com formato falhou" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:210 pkt-line.c:217 -#, fuzzy -msgid "packet write failed" +#: pkt-line.c:222 +#, fuzzy, c-format +msgid "packet write failed: %s" msgstr "escrita de pacote falhou" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 #, fuzzy msgid "read error" msgstr "erro do programa" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 #, fuzzy msgid "the remote end hung up unexpectedly" msgstr "O remoto desligou após contacto inicial" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, fuzzy, c-format msgid "protocol error: bad line length character: %.4s" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, fuzzy, c-format msgid "protocol error: bad line length %d" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "erro remoto: %s" -#: preload-index.c:119 +#: preload-index.c:125 #, fuzzy msgid "Refreshing index" msgstr "Refrescando index" -#: preload-index.c:138 +#: preload-index.c:144 #, fuzzy, c-format msgid "unable to create threaded lstat: %s" msgstr "incapaz criar thread de lstat: %s" -#: pretty.c:983 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "incapaz analisar formato de --pretty" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" +#: protocol-caps.c:103 +#, fuzzy +msgid "object-info: expected flush after arguments" +msgstr "--continue supõe argumento nenhum" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "A remover objetos duplicados" -#: range-diff.c:77 +#: range-diff.c:78 #, fuzzy msgid "could not start `log`" msgstr "incapaz começar `log`" -#: range-diff.c:79 +#: range-diff.c:80 #, fuzzy msgid "could not read `log` output" msgstr "incapaz ler output de `log`" -#: range-diff.c:98 sequencer.c:5310 +#: range-diff.c:101 sequencer.c:5550 #, fuzzy, c-format msgid "could not parse commit '%s'" msgstr "incapaz analisar commit '%s'" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" -#: range-diff.c:137 +#: range-diff.c:140 #, fuzzy, c-format msgid "could not parse git header '%.*s'" msgstr "incapaz analisar cabeçalho git '%.*s'" -#: range-diff.c:299 +#: range-diff.c:307 #, fuzzy msgid "failed to generate diff" -msgstr "falha ao criar o ficheiro %s" +msgstr "" -#: range-diff.c:532 range-diff.c:534 +#: range-diff.c:559 +#, fuzzy +msgid "--left-only and --right-only are mutually exclusive" +msgstr "" + +#: range-diff.c:562 range-diff.c:564 #, fuzzy, c-format msgid "could not parse log for '%s'" msgstr "incapaz analisar log para '%s'" -#: read-cache.c:682 +#: read-cache.c:710 #, fuzzy, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "%s: já existe no índice" -#: read-cache.c:698 +#: read-cache.c:726 #, fuzzy msgid "cannot create an empty blob in the object database" -msgstr "escrever o objeto na base de dados de objetos" +msgstr "" -#: read-cache.c:720 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:725 +#: read-cache.c:753 #, fuzzy, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' tem commit checked out nenhum" -#: read-cache.c:777 +#: read-cache.c:805 #, fuzzy, c-format msgid "unable to index file '%s'" msgstr "incapaz indexar ficheiro '%s'" -#: read-cache.c:796 +#: read-cache.c:824 #, fuzzy, c-format msgid "unable to add '%s' to index" msgstr "incapaz adicionar %s a index" -#: read-cache.c:807 +#: read-cache.c:835 #, fuzzy, c-format msgid "unable to stat '%s'" msgstr "incapaz obter estatutário de '%s'" -#: read-cache.c:1318 +#: read-cache.c:1358 #, fuzzy, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' aparece ambo como ficheiro e como pasta" -#: read-cache.c:1524 +#: read-cache.c:1573 #, fuzzy msgid "Refresh index" msgstr "Refresca index" -#: read-cache.c:1639 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5722,7 +6446,7 @@ msgstr "" "index.version definido, mas com valor inválido.\n" "A usar a versão %i" -#: read-cache.c:1649 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5731,140 +6455,145 @@ msgstr "" "GIT_INDEX_VERSION definido, mas com valor inválido.\n" "A usar a versão %i" -#: read-cache.c:1705 +#: read-cache.c:1771 #, fuzzy, c-format msgid "bad signature 0x%08x" -msgstr "adicionar uma assinatura" +msgstr "" -#: read-cache.c:1708 +#: read-cache.c:1774 #, fuzzy, c-format msgid "bad index version %d" msgstr "versão de índice '%s' incorreta" -#: read-cache.c:1717 +#: read-cache.c:1783 #, fuzzy msgid "bad index file sha1 signature" -msgstr "adicionar uma assinatura" +msgstr "" -#: read-cache.c:1747 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1749 +#: read-cache.c:1819 #, fuzzy, c-format msgid "ignoring %.4s extension" msgstr "modelo %s ignorado" -#: read-cache.c:1786 +#: read-cache.c:1856 #, fuzzy, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de %.*s desconhecido %s" -#: read-cache.c:1802 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1859 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1862 +#: read-cache.c:1932 #, fuzzy, c-format msgid "multiple stage entries for merged file '%s'" msgstr "multíplas entradas de estágio para ficheiro juntado '%s'" -#: read-cache.c:1865 +#: read-cache.c:1935 #, fuzzy, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de estágio desordenadas para '%s'" -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 +#: builtin/submodule--helper.c:331 msgid "index file corrupt" -msgstr "ficheiro de índice corrompido" +msgstr "" -#: read-cache.c:2115 +#: read-cache.c:2185 #, fuzzy, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "incapaz criar thread load_cache_entries: %s" -#: read-cache.c:2128 +#: read-cache.c:2198 #, fuzzy, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "incapaz juntar a thread load_cache_entries: %s" -#: read-cache.c:2161 +#: read-cache.c:2231 #, fuzzy, c-format msgid "%s: index file open failed" msgstr "falha ao adicionar ficheiros" -#: read-cache.c:2165 +#: read-cache.c:2235 #, fuzzy, c-format msgid "%s: cannot stat the open index" msgstr "%s: incapaz obter estatutário de index aberto" -#: read-cache.c:2169 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2173 +#: read-cache.c:2243 #, fuzzy, c-format -msgid "%s: unable to map index file" -msgstr "%s: incapaz mapear ficheiro index" +msgid "%s: unable to map index file%s" +msgstr "%s: incapaz mapear ficheiro index%s" -#: read-cache.c:2215 +#: read-cache.c:2286 #, fuzzy, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "incapaz criar thread load_index_extensions: %s" -#: read-cache.c:2242 +#: read-cache.c:2313 #, fuzzy, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "incapaz juntar a thread load_index_extensions: %s" -#: read-cache.c:2274 +#: read-cache.c:2351 #, fuzzy, c-format msgid "could not freshen shared index '%s'" msgstr "incapaz refrescar index partilhado '%s'" -#: read-cache.c:2321 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "incapaz fechar '%s'" -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 +#: read-cache.c:3074 +#, fuzzy +msgid "failed to convert to a sparse-index" +msgstr "" + +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 #, fuzzy, c-format msgid "could not stat '%s'" msgstr "incapaz obter estatutário '%s'" -#: read-cache.c:3133 +#: read-cache.c:3158 #, c-format msgid "unable to open git dir: %s" msgstr "incapaz abrir pasta git: %s" -#: read-cache.c:3145 +#: read-cache.c:3170 #, c-format msgid "unable to unlink: %s" msgstr "incapaz deslinkar: %s" -#: read-cache.c:3170 +#: read-cache.c:3199 #, fuzzy, c-format msgid "cannot fix permission bits on '%s'" msgstr "incapaz arranjar bits de permissão em '%s'" -#: read-cache.c:3319 +#: read-cache.c:3348 #, fuzzy, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: incapaz baixar para estágio #0" @@ -5896,7 +6625,10 @@ msgid "" "r, reword = use commit, but edit the commit message\n" "e, edit = use commit, but stop for amending\n" "s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" @@ -5905,7 +6637,7 @@ msgid "" "m, merge [-C | -c ]