summaryrefslogtreecommitdiff
path: root/po/pt_PT.po
diff options
context:
space:
mode:
authorDaniel Santos <hello@brighterdan.com>2021-07-23 15:57:22 (GMT)
committerDaniel Santos <hello@brighterdan.com>2021-08-03 12:20:18 (GMT)
commit8d2cca9754a94cf2de43791f8c781ced23f4f3cf (patch)
tree4e6953f940675a5075a0442d4657a57e0592c4c3 /po/pt_PT.po
parentea00f105a7f86ff669195d1225c034dad9cc0708 (diff)
downloadgit-8d2cca9754a94cf2de43791f8c781ced23f4f3cf.zip
git-8d2cca9754a94cf2de43791f8c781ced23f4f3cf.tar.gz
git-8d2cca9754a94cf2de43791f8c781ced23f4f3cf.tar.bz2
l10n: pt_PT: add Portuguese translations part 5
* git-po-helper update Signed-off-by: Daniel Santos <hello@brighterdan.com>
Diffstat (limited to 'po/pt_PT.po')
-rw-r--r--po/pt_PT.po9578
1 files changed, 5282 insertions, 4296 deletions
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 276b4a1..a468d1d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -134,7 +134,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-12-15 16:27+0800\n"
+"POT-Creation-Date: 2021-05-17 16:02+0800\n"
"PO-Revision-Date: 2020-10-14 11:43+0100\n"
"Last-Translator: Daniel Santos <hello@brighterdan.com>\n"
"Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"
@@ -149,9 +149,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:3944 sequencer.c:4099 builtin/rebase.c:1528
+#: builtin/rebase.c:1953
msgid "could not read index"
msgstr "incapaz de ler index"
@@ -179,7 +179,7 @@ msgstr "Atualizar"
msgid "could not 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:3687
#, fuzzy
msgid "could not write index"
msgstr "incapaz de escrever index"
@@ -196,7 +196,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'"
@@ -346,12 +346,12 @@ 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
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
+#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
+#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
+#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
#: git-add--interactive.perl:213
msgid "path"
msgstr "path"
@@ -788,8 +788,8 @@ msgstr "'git apply --cached' falhou"
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
#, fuzzy
@@ -897,7 +897,7 @@ msgstr "Lamento, incapaz de editar este pedaço"
msgid "'git apply' failed"
msgstr "'git apply' falhou"
-#: advice.c:143
+#: advice.c:145
#, c-format
msgid ""
"\n"
@@ -906,37 +906,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 <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -944,23 +944,36 @@ msgstr ""
"Corrija-os em worktree, e use 'git add/rm <ficheiro>' 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 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"
@@ -1010,85 +1023,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"
-#: 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 "
-"%d"
+msgstr ""
+"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"
-#: apply.c:928
+#: 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"
+msgstr ""
+"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha "
+"%d"
-#: apply.c:929
+#: apply.c:928
#, 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 +1114,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 +1208,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:861 read-cache.c:890
+#: read-cache.c:1351
#, 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"
@@ -1410,7 +1427,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:523
#, c-format
msgid "failed to write to '%s'"
msgstr "falha a escrever para '%s'"
@@ -1446,7 +1463,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 +1478,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:679 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:2317
msgid "num"
msgstr "num"
-#: apply.c:4996
+#: apply.c:5001
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> 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 <n> lines of context match"
msgstr "garantir que, pelo menos, <n> 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:2293 builtin/am.c:2296
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
+#: 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 pedaços rejeitados nos respetivos ficheiros *.rej"
-#: apply.c:5046
+#: apply.c:5051
msgid "allow overlapping hunks"
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:1474 builtin/count-objects.c:98 builtin/fsck.c:755
+#: builtin/log.c:2295 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:2305
msgid "root"
msgstr "raiz"
-#: apply.c:5055
+#: apply.c:5060
msgid "prepend <root> to all filenames"
msgstr "preceder <root> a todos os nomes de ficheiro"
@@ -1694,145 +1714,145 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <cmd>] --list"
-#: archive.c:192
+#: archive.c:188
#, fuzzy, c-format
msgid "cannot read %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:3536 sequencer.c:3645 builtin/am.c:261 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:646 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"
-#: 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:1772
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:922 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
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
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 <repo>"
msgstr "obter o arquivo a partir do repositório remoto <repo>"
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
#: 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"
-#: 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 +1862,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 +1949,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 +1969,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 +1994,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:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
+#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
+#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
+#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
+#: builtin/pack-objects.c:3661 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 +2115,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,12 +2159,12 @@ 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"
@@ -2167,8 +2189,8 @@ msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"
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:136 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'"
@@ -2213,314 +2235,319 @@ msgstr "Impossível gerar pack-objects"
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:386
#, 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:490
#, fuzzy, c-format
msgid "unsupported bundle version %d"
msgstr "fora de suporte versão bundle %d"
-#: bundle.c:500
+#: bundle.c:492
#, 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:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento irreconhecível: %s"
-#: bundle.c:530
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Criação de bundle vazio recusada."
-#: bundle.c:540
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "incapaz criar '%s'"
-#: bundle.c:565
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack terminou inesperadamente"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr ""
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr ""
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr ""
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+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:1340
#, 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:2897
#, 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 "mostrar commits em ordem topológica"
+
+#: 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."
-#: 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:906
#, 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"
-#: 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:2450
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2388
+#: commit-graph.c:2460
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2398 commit-graph.c:2413
+#: commit-graph.c:2470 commit-graph.c:2485
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2405
+#: commit-graph.c:2477
#, 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:2495
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2438
+#: commit-graph.c:2510
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2445
+#: commit-graph.c:2517
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2455
+#: commit-graph.c:2527
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2464
+#: commit-graph.c:2536
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2478
+#: commit-graph.c:2550
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2483
+#: commit-graph.c:2555
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2487
+#: commit-graph.c:2559
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2503
+#: commit-graph.c:2576
#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2509
+#: commit-graph.c:2582
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
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:371 builtin/am.c:416
+#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "incapaz analisar %s"
@@ -2542,27 +2569,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 +2604,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,297 +2614,342 @@ 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"
-#: config.c:450 config.c:462
+#: config.c:511
+#, fuzzy
+msgid "empty config key"
+msgstr "usar ficheiro de configuração do repositório"
+
+#: 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"
-#: config.c:836
+#: config.c:622
+#, fuzzy, c-format
+msgid "bogus count in %s"
+msgstr "cadeia malformada %s"
+
+#: config.c:626
+#, fuzzy, c-format
+msgid "too many entries in %s"
+msgstr "Demasiados argumentos."
+
+#: 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 "valor inválido de %s"
+
+#: 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"
-#: 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:3924
#, 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:1873
#, fuzzy, c-format
msgid "failed to parse %s"
msgstr "falha a analisar %s"
-#: config.c:1759
+#: config.c:1929
msgid "unable to parse command-line config"
msgstr "incapaz analisar config de linha de comandos"
-#: config.c:2122
+#: config.c:2293
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:2467
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Inválido %s: '%s'"
-#: config.c:2341
+#: config.c:2512
#, 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:2558
#, 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:2560
#, 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:2644
#, fuzzy, c-format
msgid "invalid section name '%s'"
msgstr "conteúdo inválido: '%s'"
-#: config.c:2505
+#: config.c:2676
#, c-format
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
-#: config.c:2534
+#: config.c:2705
#, 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:2957 config.c:3283
#, fuzzy, c-format
msgid "could not lock config file %s"
msgstr "incapaz trancar ficheiro config %s"
-#: config.c:2797
+#: config.c:2968
#, fuzzy, c-format
msgid "opening %s"
msgstr "abrindo %s"
-#: config.c:2834 builtin/config.c:361
+#: config.c:3005 builtin/config.c:361
#, fuzzy, c-format
msgid "invalid pattern: %s"
msgstr "padrão inválido: %s"
-#: config.c:2859
+#: config.c:3030
#, fuzzy, c-format
msgid "invalid config file %s"
msgstr "ficheiro config inválido %s"
-#: config.c:2872 config.c:3125
+#: config.c:3043 config.c:3296
#, c-format
msgid "fstat on %s failed"
msgstr "falha de fstat de %s"
-#: config.c:2883
+#: config.c:3054
#, fuzzy, c-format
msgid "unable to mmap '%s'"
msgstr "incapaz mmap '%s'"
-#: config.c:2892 config.c:3130
+#: config.c:3063 config.c:3301
#, fuzzy, c-format
msgid "chmod on %s failed"
msgstr "falha de fstat de %s"
-#: config.c:2977 config.c:3227
+#: config.c:3148 config.c:3398
#, fuzzy, c-format
msgid "could not write config file %s"
msgstr "incapaz escrever ficheiro config %s"
-#: config.c:3011
+#: config.c:3182
#, 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:3184 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:3274
#, fuzzy, c-format
msgid "invalid section name: %s"
msgstr "opção inválida: %s"
-#: config.c:3270
+#: config.c:3441
#, fuzzy, c-format
msgid "missing value for '%s'"
msgstr "valor inválido de %s"
@@ -2941,52 +3013,52 @@ msgstr "caminho inválido '%s'"
msgid "protocol error: unexpected '%s'"
msgstr "erro de protocolo: cabeçalho de pacote incorreto"
-#: 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"
-#: 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..."
-#: 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 +3068,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"
-#: 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:188 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "A verificar conectividade"
@@ -3069,17 +3145,17 @@ msgstr "falha ao escrever para rev-list"
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 +3164,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 +3178,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'"
-#: convert.c:837
+#: convert.c:826
#, fuzzy
msgid "unexpected filter type"
msgstr "fim de ficheiro inesperado"
-#: 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'"
-#: convert.c:1508
+#: convert.c:1490
#, fuzzy, c-format
msgid "%s: smudge filter %s failed"
msgstr "falha ao atualizar os ficheiros"
@@ -3311,24 +3387,29 @@ msgstr ""
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diff-lib.c:534
+#: diff-merges.c:80
+#, fuzzy, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconhecido '%s' da chave '%s'"
+
+#: diff-lib.c:538
msgid "--merge-base does not work with ranges"
msgstr ""
-#: diff-lib.c:536
+#: diff-lib.c:540
msgid "--merge-base only works with commits"
msgstr ""
-#: diff-lib.c:553
+#: diff-lib.c:557
#, fuzzy
msgid "unable to get HEAD"
msgstr "incapaz obter HEAD"
-#: diff-lib.c:560
+#: diff-lib.c:564
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:562
+#: diff-lib.c:566
msgid "multiple merge bases found"
msgstr ""
@@ -3386,36 +3467,36 @@ msgstr ""
"Erros encontrados na variável de configuração 'diff.dirstat':\n"
"%s"
-#: diff.c:4276
+#: diff.c:4278
#, c-format
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:4625
+#: diff.c:4630
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:4633
#, fuzzy
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: diff.c:4706
+#: diff.c:4712
msgid "--follow requires exactly one pathspec"
msgstr "--follow requer exatamente um único especificador de caminho"
-#: diff.c:4754
+#: diff.c:4760
#, 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:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
#: 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"
-#: diff.c:4791
+#: diff.c:4797
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3424,539 +3505,555 @@ msgstr ""
"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
"%s"
-#: diff.c:4876
+#: diff.c:4882
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4900
+#: diff.c:4906
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4914
+#: diff.c:4920
#, fuzzy, c-format
msgid "unable to resolve '%s'"
msgstr "incapaz resolver '%s'"
-#: diff.c:4964 diff.c:4970
+#: diff.c:4970 diff.c:4976
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4982
+#: diff.c:4988
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5003
+#: diff.c:5009
#, fuzzy, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumento incorreto --color-moved: %s"
-#: diff.c:5022
+#: diff.c:5028
#, fuzzy, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "objeto inválido '%s' fornecido."
-#: diff.c:5062
+#: diff.c:5068
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5098 diff.c:5118
+#: diff.c:5104 diff.c:5124
#, fuzzy, c-format
msgid "invalid argument to %s"
msgstr "valor inválido de %s"
-#: diff.c:5222
+#: diff.c:5228
#, fuzzy, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "valor inválido de %s"
-#: diff.c:5271
+#: diff.c:5277
#, 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:5333
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5350
+#: diff.c:5369
msgid "Diff output format options"
msgstr ""
-#: diff.c:5352 diff.c:5358
+#: diff.c:5371 diff.c:5377
#, fuzzy
msgid "generate patch"
msgstr "incorporar o patch"
-#: diff.c:5355 builtin/log.c:178
+#: diff.c:5374 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:5379 diff.c:5493 diff.c:5500
msgid "<n>"
msgstr ""
-#: diff.c:5361 diff.c:5364
+#: diff.c:5380 diff.c:5383
#, fuzzy
msgid "generate diffs with <n> lines context"
msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
-#: diff.c:5366
+#: diff.c:5385
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5369
+#: diff.c:5388
#, fuzzy
msgid "synonym for '-p --raw'"
msgstr "(sinónimo de --stat)"
-#: diff.c:5373
+#: diff.c:5392
#, fuzzy
msgid "synonym for '-p --stat'"
msgstr "(sinónimo de --stat)"
-#: diff.c:5377
+#: diff.c:5396
#, fuzzy
msgid "machine friendly --stat"
msgstr "saída inteligível por máquina"
-#: diff.c:5380
+#: diff.c:5399
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5382 diff.c:5390
+#: diff.c:5401 diff.c:5409
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5383
+#: diff.c:5402
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5387
+#: diff.c:5406
#, fuzzy
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo de --files-with-matches"
-#: diff.c:5391
+#: diff.c:5410
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5395
+#: diff.c:5414
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5398
+#: diff.c:5417
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5401
+#: diff.c:5420
#, fuzzy
msgid "show only names of changed files"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: diff.c:5404
+#: diff.c:5423
#, fuzzy
msgid "show only names and status of changed files"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: diff.c:5406
+#: diff.c:5425
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5407
+#: diff.c:5426
#, fuzzy
msgid "generate diffstat"
msgstr "diff status inesperado %c"
-#: diff.c:5409 diff.c:5412 diff.c:5415
+#: diff.c:5428 diff.c:5431 diff.c:5434
msgid "<width>"
msgstr ""
-#: diff.c:5410
+#: diff.c:5429
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5413
+#: diff.c:5432
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5416
+#: diff.c:5435
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5418
+#: diff.c:5437
msgid "<count>"
msgstr ""
-#: diff.c:5419
+#: diff.c:5438
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5422
+#: diff.c:5441
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5425
+#: diff.c:5444
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5428
+#: diff.c:5447
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5430
+#: diff.c:5449
#, fuzzy
msgid "show colored diff"
msgstr "mostrar ficheiros ignorados"
-#: diff.c:5431
+#: diff.c:5450
msgid "<kind>"
msgstr ""
-#: diff.c:5432
+#: diff.c:5451
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5435
+#: diff.c:5454
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:5457 diff.c:5460 diff.c:5463 diff.c:5572
#, fuzzy
msgid "<prefix>"
msgstr "<prefixo>/"
-#: diff.c:5439
+#: diff.c:5458
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5442
+#: diff.c:5461
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5445
+#: diff.c:5464
#, 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:5467
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5451
+#: diff.c:5470
#, 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:5474 diff.c:5479 diff.c:5484
msgid "<char>"
msgstr ""
-#: diff.c:5456
+#: diff.c:5475
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5461
+#: diff.c:5480
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5466
+#: diff.c:5485
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5469
+#: diff.c:5488
#, fuzzy
msgid "Diff rename options"
msgstr "Opções genéricas"
-#: diff.c:5470
+#: diff.c:5489
#, fuzzy
msgid "<n>[/<m>]"
msgstr "<n>[,<base>]"
-#: diff.c:5471
+#: diff.c:5490
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5475
+#: diff.c:5494
#, fuzzy
msgid "detect renames"
msgstr "nome do remoto"
-#: diff.c:5479
+#: diff.c:5498
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5482
+#: diff.c:5501
msgid "detect copies"
msgstr ""
-#: diff.c:5486
+#: diff.c:5505
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5488
+#: diff.c:5507
#, fuzzy
msgid "disable rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
-#: diff.c:5491
+#: diff.c:5510
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5493
+#: diff.c:5512
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5496
+#: diff.c:5515
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5498
+#: diff.c:5517
#, fuzzy
msgid "Diff algorithm options"
msgstr "opção inválida: %s"
-#: diff.c:5500
+#: diff.c:5519
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5503
+#: diff.c:5522
#, fuzzy
msgid "ignore whitespace when comparing lines"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5506
+#: diff.c:5525
#, fuzzy
msgid "ignore changes in amount of whitespace"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5509
+#: diff.c:5528
#, fuzzy
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5512
+#: diff.c:5531
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5515
+#: diff.c:5534
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587
+#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
msgid "<regex>"
msgstr ""
-#: diff.c:5518
+#: diff.c:5537
#, fuzzy
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5521
+#: diff.c:5540
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5524
+#: diff.c:5543
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5528
+#: diff.c:5547
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5530
+#: diff.c:5549
msgid "<algorithm>"
msgstr ""
-#: diff.c:5531
+#: diff.c:5550
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5533
+#: diff.c:5552
#, fuzzy
msgid "<text>"
msgstr "texto"
-#: diff.c:5534
+#: diff.c:5553
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5536 diff.c:5545 diff.c:5548
+#: diff.c:5555 diff.c:5564 diff.c:5567
#, fuzzy
msgid "<mode>"
msgstr "modo"
-#: diff.c:5537
+#: diff.c:5556
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5540
+#: diff.c:5559
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5543
+#: diff.c:5562
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5546
+#: diff.c:5565
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5549
+#: diff.c:5568
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5552
+#: diff.c:5571
#, fuzzy
msgid "Other diff options"
msgstr "Opções genéricas"
-#: diff.c:5554
+#: diff.c:5573
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5558
+#: diff.c:5577
#, fuzzy
msgid "treat all files as text"
msgstr "processar ficheiros binários como texto"
-#: diff.c:5560
+#: diff.c:5579
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5562
+#: diff.c:5581
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5564
+#: diff.c:5583
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5566
+#: diff.c:5585
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5568
+#: diff.c:5587
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5570
+#: diff.c:5589
#, fuzzy
msgid "<when>"
msgstr "quando"
-#: diff.c:5571
+#: diff.c:5590
#, 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:5593
#, fuzzy
msgid "<format>"
msgstr "formato"
-#: diff.c:5575
+#: diff.c:5594
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5579
+#: diff.c:5598
#, fuzzy
msgid "hide 'git add -N' entries from the index"
msgstr "usar .gitattributes apenas a partir do índice"
-#: diff.c:5582
+#: diff.c:5601
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5584
+#: diff.c:5603
#, fuzzy
msgid "<string>"
msgstr "cadeia"
-#: diff.c:5585
+#: diff.c:5604
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5588
+#: diff.c:5607
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5591
+#: diff.c:5610
#, 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:5613
#, fuzzy
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "usar expressões regulares estendidas do POSIX"
-#: diff.c:5597
+#: diff.c:5616
#, fuzzy
msgid "control the order in which files appear in the output"
msgstr "mostrar outros ficheiros na saída"
-#: diff.c:5598
+#: diff.c:5617 diff.c:5620
+#, fuzzy
+msgid "<path>"
+msgstr "path"
+
+#: diff.c:5618
+#, 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:5621
+#, fuzzy
+msgid "skip the output to the specified path"
+msgstr "Repor a HEAD atual no estado especificado"
+
+#: diff.c:5623
#, fuzzy
msgid "<object-id>"
msgstr "objeto"
-#: diff.c:5599
+#: diff.c:5624
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5601
+#: diff.c:5626
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5602
+#: diff.c:5627
msgid "select files by diff type"
msgstr ""
-#: diff.c:5604
+#: diff.c:5629
#, fuzzy
msgid "<file>"
msgstr "ficheiro"
-#: diff.c:5605
+#: diff.c:5630
#, fuzzy
msgid "Output to a specific file"
msgstr "submeter somente os ficheiros especificados"
-#: diff.c:6262
+#: diff.c:6287
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:6265
+#: diff.c:6290
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:6293
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3968,15 +4065,20 @@ msgstr ""
msgid "failed to read orderfile '%s'"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: diffcore-rename.c:592
+#: diffcore-rename.c:1418
msgid "Performing inexact rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
+#: diffcore-rotate.c:29
+#, fuzzy, c-format
+msgid "No such path '%s' in the diff"
+msgstr "path %s inexistente em %s"
+
#: dir.c:578
#, 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
#, fuzzy, c-format
@@ -3997,36 +4099,36 @@ msgstr ""
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1198
+#: dir.c:1206
#, 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:2314
#, fuzzy, c-format
msgid "could not open directory '%s'"
msgstr "incapaz abrir pasta '%s'"
-#: dir.c:2605
+#: dir.c:2614
msgid "failed to get kernel name and information"
msgstr "falha ao obter nome e informação do kernel"
-#: dir.c:2729
+#: dir.c:2738
#, 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:3543
#, fuzzy, c-format
msgid "index file corrupt in repo %s"
msgstr "ficheiro de índice corrompido"
-#: dir.c:3565 dir.c:3570
+#: dir.c:3590 dir.c:3595
#, c-format
msgid "could not create directories for %s"
msgstr "incapaz criar pasta para %s"
-#: dir.c:3599
+#: dir.c:3624
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "incapaz migrar pasta git de '%s' para '%s'"
@@ -4036,22 +4138,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:179
#, fuzzy
msgid "Filtering content"
msgstr "imprimir conteúdo da tag"
-#: entry.c:478
+#: entry.c:500
#, c-format
msgid "could not stat file '%s'"
msgstr "incapaz obter estatutário de 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'"
@@ -4061,267 +4163,281 @@ msgstr "incapaz definir GIT_DIR para '%s'"
msgid "too many args to run %s"
msgstr "Demasiados argumentos."
-#: fetch-pack.c:177
+#: fetch-pack.c:182
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: esperava-se 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"
-#: 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 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 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"
-#: 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 "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"
-#: 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:1651
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:2034
#, 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"
-#: 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"
-#: fetch-pack.c:1480
+#: fetch-pack.c:1499
#, fuzzy, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "fim de ficheiro inesperado"
-#: 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"
-#: fetch-pack.c:1897
+#: fetch-pack.c:1930
msgid "no matching remote head"
msgstr "corresponde a remote head nenhuma"
-#: fetch-pack.c:1920 builtin/clone.c:693
+#: fetch-pack.c:1953 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:2056
+#, fuzzy
+msgid "unexpected 'ready' from remote"
+msgstr "fim de ficheiro inesperado"
+
+#: fetch-pack.c:2079
#, c-format
msgid "no such remote ref %s"
msgstr "referência remota %s inexistente"
-#: fetch-pack.c:1950
+#: fetch-pack.c:2082
#, 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"
@@ -4330,24 +4446,24 @@ msgstr "gpg falhou assinar os dados"
msgid "ignore 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 <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:2100
+#: grep.c:1893
#, 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:1910 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'"
-#: grep.c:2128
+#: grep.c:1921
#, c-format
msgid "'%s': short read"
msgstr "'%s': leitura truncada"
@@ -4417,7 +4533,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 +4685,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:<depth>'"
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=<type>' isnot a valid object type"
+msgstr "'%s' em '%s' é carimbo de data/hora inválido"
+
+#: list-objects-filter-options.c:124
#, fuzzy, c-format
msgid "invalid filter-spec '%s'"
msgstr "ficheiro inválido: '%s'"
-#: 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 +4745,7 @@ msgstr ""
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: list-objects.c:375
+#: list-objects.c:395
#, fuzzy, c-format
msgid "unable to load root tree for commit %s"
msgstr "incapaz carregar raiz de árvore para commit %s"
@@ -4653,11 +4774,240 @@ 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 "valor inválido de %s"
+
+#: ls-refs.c:167
msgid "expected flush after ls-refs arguments"
msgstr ""
-#: merge-ort-wrappers.c:13 merge-recursive.c:3672
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr ""
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, fuzzy, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "incapaz copiar '%s' para '%s'"
+
+#: merge-ort.c:1116 merge-recursive.c:1205
+#, fuzzy, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Falha ao registar o submódulo '$sm_path'"
+
+#: merge-ort.c:1125 merge-recursive.c:1212
+#, fuzzy, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Falha ao registar o submódulo '$sm_path'"
+
+#: merge-ort.c:1134 merge-recursive.c:1219
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-ort.c:1144 merge-ort.c:1151
+#, fuzzy, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Avanço-rápido para $sha1"
+
+#: merge-ort.c:1172
+#, fuzzy, c-format
+msgid "Failed to merge submodule %s"
+msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+
+#: merge-ort.c:1179
+#, fuzzy, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr "Falha ao registar o submódulo '$sm_path'"
+
+#: merge-ort.c:1183 merge-recursive.c:1273
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+
+#: merge-ort.c:1196
+#, fuzzy, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr "Falha ao registar o submódulo '$sm_path'"
+
+#: merge-ort.c:1415 merge-recursive.c:1362
+msgid "Failed to execute internal merge"
+msgstr "Falha ao executar integração interna"
+
+#: merge-ort.c:1420 merge-recursive.c:1367
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Incapaz de adicionar %s à base de dados"
+
+#: merge-ort.c:1427 merge-recursive.c:1400
+#, c-format
+msgid "Auto-merging %s"
+msgstr "A integrar automaticamente %s"
+
+#: merge-ort.c:1566 merge-recursive.c:2122
+#, 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:1576 merge-recursive.c:2132
+#, 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:1634
+#, 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:1788 merge-recursive.c:2468
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-ort.c:1932 merge-recursive.c:3244
+#, 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:1939 merge-recursive.c:3251
+#, 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:1952 merge-recursive.c:3247
+#, 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:1960 merge-recursive.c:3254
+#, 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:2103
+#, 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:2198
+#, 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:2217 merge-ort.c:2241
+#, 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:2550 merge-recursive.c:3002
+#, c-format
+msgid "cannot read object %s"
+msgstr "incapaz ler objeto %s"
+
+#: merge-ort.c:2553 merge-recursive.c:3005
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objeto %s é blob nenhum"
+
+#: merge-ort.c:2981
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#: merge-ort.c:3055
+#, 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:3062
+#, 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:3162 merge-recursive.c:3081
+msgid "content"
+msgstr "conteúdo"
+
+#: merge-ort.c:3164 merge-recursive.c:3085
+msgid "add/add"
+msgstr "adicionar/adicionar"
+
+#: merge-ort.c:3166 merge-recursive.c:3130
+msgid "submodule"
+msgstr "submódulo"
+
+#: merge-ort.c:3168 merge-recursive.c:3131
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLITO (%s): conflito de integração em %s"
+
+#: merge-ort.c:3198
+#, 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:3433
+#, 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:3730
+#, fuzzy, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "falha ao abrir '%s': %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3699
#, fuzzy, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4667,10 +5017,10 @@ msgstr ""
"integrar:\n"
"%%s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3436
-#, fuzzy, c-format
-msgid "Already up to date!"
-msgstr "Já está atualizado!"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#, fuzzy
+msgid "Already up to date."
+msgstr "Já está atualizado."
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4686,126 +5036,86 @@ msgstr "addinfo_cache falhou no caminho '%s'"
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "addinfo_cache falhou no caminho '%s'"
-#: merge-recursive.c:874
+#: merge-recursive.c:876
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falha ao criar o caminho '%s'%s"
-#: merge-recursive.c:885
+#: merge-recursive.c:887
#, 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
+#: merge-recursive.c:901 merge-recursive.c:920
msgid ": perhaps a D/F conflict?"
msgstr ": talvez um conflito D/F?"
-#: merge-recursive.c:908
+#: merge-recursive.c:910
#, 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
+#: merge-recursive.c:951 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "incapaz ler objeto %s '%s'"
-#: merge-recursive.c:954
+#: merge-recursive.c:956
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob para %s '%s' esperado"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "failed to open '%s': %s"
msgstr "falha ao abrir '%s': %s"
-#: merge-recursive.c:990
+#: merge-recursive.c:992
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falha ao criar a ligação simbólica '%s': %s"
-#: merge-recursive.c:995
+#: merge-recursive.c:997
#, 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
-#, fuzzy, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Falha ao registar o submódulo '$sm_path'"
-
-#: merge-recursive.c:1198
-#, fuzzy, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Falha ao registar o submódulo '$sm_path'"
-
-#: merge-recursive.c:1205
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1227 merge-recursive.c:1239
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1230 merge-recursive.c:1242
#, fuzzy, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avanço-rápido para $sha1"
-#: merge-recursive.c:1251
+#: merge-recursive.c:1265
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1255
+#: merge-recursive.c:1269
#, fuzzy, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: merge-recursive.c:1256
+#: merge-recursive.c:1270
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1259
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-
-#: merge-recursive.c:1268
+#: merge-recursive.c:1282
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1341
-msgid "Failed to execute internal merge"
-msgstr "Falha ao executar integração interna"
-
-#: merge-recursive.c:1346
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Incapaz de adicionar %s à base de dados"
-
-#: merge-recursive.c:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "A integrar automaticamente %s"
-
-#: merge-recursive.c:1402
+#: merge-recursive.c:1424
#, 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:1496
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4814,7 +5124,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:1501
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4823,7 +5133,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:1508
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4832,7 +5142,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:1513
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4841,44 +5151,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:1548
msgid "rename"
msgstr "mudar nome"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1548
msgid "renamed"
msgstr "nome mudado"
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
#, 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:1609
#, 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:1667
#, 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:1698
#, 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:1703
#, 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:1730
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4887,18 +5196,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:1735
msgid " (left unresolved)"
msgstr " (por resolver)"
-#: merge-recursive.c:1805
+#: merge-recursive.c:1827
#, 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:2090
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4906,21 +5215,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:2224
#, fuzzy, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4929,141 +5224,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:3069
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3069
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:3108
#, 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:3161
#, 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:3368
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: merge-recursive.c:3362
+#: merge-recursive.c:3391
msgid "file/directory"
msgstr "ficheiro/diretório"
-#: merge-recursive.c:3367
+#: merge-recursive.c:3396
msgid "directory/file"
msgstr "diretório/ficheiro"
-#: merge-recursive.c:3374
+#: merge-recursive.c:3403
#, 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:3412
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:3392
+#: merge-recursive.c:3421
#, 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:3474
#, 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:3568
msgid "Merging:"
msgstr "A integrar:"
-#: merge-recursive.c:3563
+#: merge-recursive.c:3581
#, 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:3631
msgid "merge returned no commit"
msgstr "junção retornou commit nenhum"
-#: merge-recursive.c:3769
+#: merge-recursive.c:3796
#, 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:3814 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 +5305,203 @@ 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:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
+#: 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 "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'"
-#: midx.c:486
+#: midx.c:496
#, fuzzy, c-format
msgid "failed to open pack-index '%s'"
msgstr "falha ao abrir '%s'"
-#: 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"
-#: midx.c:846
+#: midx.c:880 builtin/index-pack.c:1535
+#, fuzzy
+msgid "cannot store reverse index file"
+msgstr "incapaz guardar ficheiro index"
+
+#: midx.c:933
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:879
+#: midx.c:979
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:931
+#: midx.c:1024
+#, fuzzy, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "Subcomando desconhecido: %s"
+
+#: midx.c:1029
+#, fuzzy, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "o repositório de referência '%s' está enxertado"
+
+#: midx.c:1045
#, 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:1125 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "falha ao remover %s"
-#: midx.c:1060
+#: midx.c:1156
#, fuzzy, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falha ao limpar o índice"
-#: midx.c:1116
+#: midx.c:1214
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1124
+#: midx.c:1222
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1139
+#: midx.c:1237
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1144
+#: midx.c:1242
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1153
+#: midx.c:1251
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1162
+#: midx.c:1260
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1182
+#: midx.c:1280
#, fuzzy
msgid "Sorting objects by packfile"
msgstr "A escrever objetos"
-#: midx.c:1189
+#: midx.c:1287
#, fuzzy
msgid "Verifying object offsets"
msgstr "A escrever objetos"
-#: midx.c:1205
+#: midx.c:1303
#, 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:1309
#, fuzzy, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: midx.c:1220
+#: midx.c:1318
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1245
+#: midx.c:1343
#, fuzzy
msgid "Counting referenced objects"
msgstr "Contando objetos referenciados"
-#: midx.c:1255
+#: midx.c:1353
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1446
+#: midx.c:1544
#, fuzzy
msgid "could not start pack-objects"
msgstr "incapaz de começar pack-objects"
-#: midx.c:1466
+#: midx.c:1564
#, 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 +5515,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 +5525,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 +5547,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:577
+#, fuzzy, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "incapaz normalizar path de objeto alternativo: %s"
+
+#: object-file.c:649
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: object-file.c:656
+#, fuzzy, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz normalizar pasta de objeto: %s"
+
+#: object-file.c:699
+#, fuzzy
+msgid "unable to fdopen alternates lockfile"
+msgstr "incapaz de fdopen lockfile alternativo"
+
+#: object-file.c:717
+#, fuzzy
+msgid "unable to read alternates file"
+msgstr "incapaz ler ficheiro alternativo"
+
+#: object-file.c:724
+#, fuzzy
+msgid "unable to move new alternates file into place"
+msgstr "incapaz mover novo ficheiro alternativo para o sítio"
+
+#: object-file.c:759
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "caminho '%s' é inexistente"
+
+#: object-file.c:780
+#, 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:786
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositório referência '%s' é repositório local nenhum."
+
+#: object-file.c:792
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "o repositório de referência '%s' é raso"
+
+#: object-file.c:800
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "o repositório de referência '%s' está enxertado"
+
+#: object-file.c:860
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: object-file.c:1010
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: object-file.c:1031
+#, fuzzy
+msgid "mmap failed"
+msgstr "%s falhou"
+
+#: object-file.c:1195
+#, fuzzy, c-format
+msgid "object file %s is empty"
+msgstr "objeto local %s corrompido"
+
+#: object-file.c:1330 object-file.c:2524
+#, fuzzy, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto solto '%s' corrupto"
+
+#: object-file.c:1332 object-file.c:2528
+#, fuzzy, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "lixo no fim de objeto solto '%s'"
+
+#: object-file.c:1374
+#, fuzzy
+msgid "invalid object type"
+msgstr "tipo de objeto incorreto."
+
+#: object-file.c:1458
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1461
+#, fuzzy, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz desempacotar cabeçalho %s"
+
+#: object-file.c:1467
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1470
+#, fuzzy, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz processar cabeçalho %s"
+
+#: object-file.c:1697
+#, fuzzy, c-format
+msgid "failed to read object %s"
+msgstr "falha ao ler o objeto '%s'."
+
+#: object-file.c:1701
+#, fuzzy, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s substituto, por encontrar para %s"
+
+#: object-file.c:1705
+#, fuzzy, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objeto local %s corrompido"
+
+#: object-file.c:1709
+#, fuzzy, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objeto local %s corrompido"
+
+#: object-file.c:1814
+#, fuzzy, c-format
+msgid "unable to write file %s"
+msgstr "incapaz escrever ficheiro %s"
+
+#: object-file.c:1821
+#, fuzzy, c-format
+msgid "unable to set permission to '%s'"
+msgstr "incapaz definir permissão para '%s'"
+
+#: object-file.c:1828
+#, fuzzy
+msgid "file write error"
+msgstr "falha ao escrever para rev-list"
+
+#: object-file.c:1848
+#, fuzzy
+msgid "error when closing loose object file"
+msgstr "erro ao fechar ficheiro de pacote"
+
+#: object-file.c:1913
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: object-file.c:1915
+#, fuzzy
+msgid "unable to create temporary file"
+msgstr "incapaz criar ficheiro temporário"
+
+#: object-file.c:1939
+#, fuzzy
+msgid "unable to write loose object file"
+msgstr "incapaz escrever ficheiro objeto solto"
+
+#: object-file.c:1945
+#, fuzzy, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "incapaz esvaziar objeto novo %s (%d)"
+
+#: object-file.c:1949
+#, fuzzy, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "falha de fstat de %s"
+
+#: object-file.c:1953
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: object-file.c:1963 builtin/pack-objects.c:1097
+#, fuzzy, c-format
+msgid "failed utime() on %s"
+msgstr "falha ao abrir '%s'"
+
+#: object-file.c:2040
+#, fuzzy, c-format
+msgid "cannot read object for %s"
+msgstr "incapaz ler objeto para %s"
+
+#: object-file.c:2091
+#, fuzzy
+msgid "corrupt commit"
+msgstr "substituir autor do commit"
+
+#: object-file.c:2099
+#, fuzzy
+msgid "corrupt tag"
+msgstr "mostrar tags"
+
+#: object-file.c:2199
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: object-file.c:2202
+#, fuzzy, c-format
+msgid "short read while indexing %s"
+msgstr "leitura curta enquanto indexando %s"
+
+#: object-file.c:2275 object-file.c:2285
+#, fuzzy, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falhou inserir na base de dados"
+
+#: object-file.c:2291
+#, fuzzy, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo ficheiro insustentado"
+
+#: object-file.c:2315
+#, fuzzy, c-format
+msgid "%s is not a valid object"
+msgstr "%s é objeto inválido"
+
+#: object-file.c:2317
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s é um objeto inválido '%s'"
+
+#: object-file.c:2344 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "incapaz abrir %s"
+
+#: object-file.c:2535 object-file.c:2588
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr ""
+
+#: object-file.c:2559
+#, fuzzy, c-format
+msgid "unable to mmap %s"
+msgstr "incapaz mmap %s"
+
+#: object-file.c:2564
+#, fuzzy, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz desempacotar cabeçalho de %s"
+
+#: object-file.c:2570
+#, fuzzy, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz processar cabeçalho de %s"
+
+#: object-file.c:2581
+#, fuzzy, c-format
+msgid "unable to unpack contents of %s"
+msgstr "incapaz desempacotar conteúdo de %s"
+
+#: object-name.c:486
+#, fuzzy, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "SHA1 curto %s é ambíguo"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Os candidatos são:"
+
+#: object-name.c:796
+#, 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:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr ""
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr ""
+
+#: object-name.c:1702
+#, 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:1708
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+
+#: object-name.c:1717
+#, fuzzy, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "caminho '%s' é inexistente em '%.*s'"
+
+#: object-name.c:1745
+#, 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:1761
+#, 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:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr ""
+
+#: object-name.c:1771
+#, 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:1784
+#, 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:1922
+#, 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 +5918,86 @@ 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:232
#, fuzzy, c-format
msgid "object %s has unknown type id %d"
msgstr "objeto de tipo desconhecido"
-#: object.c:246
+#: object.c:245
#, c-format
msgid "unable to parse object: %s"
msgstr "incapaz analisar objeto: %s"
-#: object.c:266 object.c:278
+#: object.c:265 object.c:277
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
+#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
#, fuzzy, c-format
msgid "unable to get size of %s"
msgstr "incapaz obter tamanho de %s"
-#: packfile.c:615
+#: pack-bitmap.c:1547 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 "ficheiro de índice corrompido"
+
+#: pack-revindex.c:234
+#, fuzzy, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "adicionar uma assinatura"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr ""
+
+#: pack-revindex.c:243
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+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 '%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:1937
#, 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:1941
#, 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?)"
@@ -5402,31 +6062,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"
-#: parse-options.c:864
+#: parse-options.c:881
#, fuzzy, c-format
msgid "unknown switch `%c'"
msgstr "opção desconhecido %s"
-#: 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 +6094,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 +6113,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 +6144,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"
-#: 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 ""
@@ -5553,7 +6213,7 @@ msgstr "incapaz escrever pacote de separador sem estado"
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,51 +6222,51 @@ 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"
-#: 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"
-#: 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"
@@ -5627,93 +6287,103 @@ msgstr ""
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:5551
#, 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:306
#, fuzzy
msgid "failed to generate diff"
msgstr "falha ao criar o ficheiro %s"
-#: range-diff.c:532 range-diff.c:534
+#: range-diff.c:558
+#, fuzzy
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "-b, -B e --orphan são mutuamente exclusivos"
+
+#: range-diff.c:561 range-diff.c:563
#, fuzzy, c-format
msgid "could not parse log for '%s'"
msgstr "incapaz analisar log para '%s'"
-#: read-cache.c:682
+#: read-cache.c:708
#, 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:724
#, fuzzy
msgid "cannot create an empty blob in the object database"
msgstr "escrever o objeto na base de dados de objetos"
-#: read-cache.c:720
+#: read-cache.c:746
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:725
+#: read-cache.c:751
#, 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:803
#, fuzzy, c-format
msgid "unable to index file '%s'"
msgstr "incapaz indexar ficheiro '%s'"
-#: read-cache.c:796
+#: read-cache.c:822
#, fuzzy, c-format
msgid "unable to add '%s' to index"
msgstr "incapaz adicionar %s a index"
-#: read-cache.c:807
+#: read-cache.c:833
#, fuzzy, c-format
msgid "unable to stat '%s'"
msgstr "incapaz obter estatutário de '%s'"
-#: read-cache.c:1318
+#: read-cache.c:1356
#, 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:1571
#, fuzzy
msgid "Refresh index"
msgstr "Refresca index"
-#: read-cache.c:1639
+#: read-cache.c:1700
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5722,7 +6392,7 @@ msgstr ""
"index.version definido, mas com valor inválido.\n"
"A usar a versão %i"
-#: read-cache.c:1649
+#: read-cache.c:1710
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5731,140 +6401,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:1766
#, fuzzy, c-format
msgid "bad signature 0x%08x"
msgstr "adicionar uma assinatura"
-#: read-cache.c:1708
+#: read-cache.c:1769
#, fuzzy, c-format
msgid "bad index version %d"
msgstr "versão de índice '%s' incorreta"
-#: read-cache.c:1717
+#: read-cache.c:1778
#, fuzzy
msgid "bad index file sha1 signature"
msgstr "adicionar uma assinatura"
-#: read-cache.c:1747
+#: read-cache.c:1812
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1749
+#: read-cache.c:1814
#, fuzzy, c-format
msgid "ignoring %.4s extension"
msgstr "modelo %s ignorado"
-#: read-cache.c:1786
+#: read-cache.c:1851
#, fuzzy, c-format
msgid "unknown index entry format 0x%08x"
msgstr "formato de %.*s desconhecido %s"
-#: read-cache.c:1802
+#: read-cache.c:1867
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1859
+#: read-cache.c:1924
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1862
+#: read-cache.c:1927
#, 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:1930
#, 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
+#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
+#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
+#: 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:332
msgid "index file corrupt"
msgstr "ficheiro de índice corrompido"
-#: read-cache.c:2115
+#: read-cache.c:2180
#, 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:2193
#, 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:2226
#, fuzzy, c-format
msgid "%s: index file open failed"
msgstr "falha ao adicionar ficheiros"
-#: read-cache.c:2165
+#: read-cache.c:2230
#, 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:2234
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2173
+#: read-cache.c:2238
#, fuzzy, c-format
msgid "%s: unable to map index file"
msgstr "%s: incapaz mapear ficheiro index"
-#: read-cache.c:2215
+#: read-cache.c:2280
#, 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:2307
#, 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:2345
#, fuzzy, c-format
msgid "could not freshen shared index '%s'"
msgstr "incapaz refrescar index partilhado '%s'"
-#: read-cache.c:2321
+#: read-cache.c:2392
#, 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:3095 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:3138
+#, fuzzy
+msgid "failed to convert to a sparse-index"
+msgstr "falha ao limpar o índice"
+
+#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
#, fuzzy, c-format
msgid "could not stat '%s'"
msgstr "incapaz obter estatutário '%s'"
-#: read-cache.c:3133
+#: read-cache.c:3222
#, c-format
msgid "unable to open git dir: %s"
msgstr "incapaz abrir pasta git: %s"
-#: read-cache.c:3145
+#: read-cache.c:3234
#, c-format
msgid "unable to unlink: %s"
msgstr "incapaz deslinkar: %s"
-#: read-cache.c:3170
+#: read-cache.c:3263
#, 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:3412
#, fuzzy, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: incapaz baixar para estágio #0"
@@ -5896,7 +6571,10 @@ msgid ""
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"f, fixup [-C | -c] <commit> = 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 <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
@@ -5905,7 +6583,7 @@ msgid ""
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
+". specified); use -c <commit> to reword the commit message\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -5921,14 +6599,14 @@ msgstr ""
"\n"
"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
-#: rebase-interactive.c:63
+#: rebase-interactive.c:66
#, fuzzy, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5936,7 +6614,7 @@ msgstr ""
"\n"
"Remove linha nenhuma. Usa explicitamente 'drop' para remover um commit.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5944,7 +6622,7 @@ msgstr ""
"\n"
"Se remover uma linha daqui AQUELE COMMIT SERÁ PERDIDO.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5958,7 +6636,7 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -5968,19 +6646,19 @@ msgstr ""
"No entanto, se remover tudo, o rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
-#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
+#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
#, fuzzy, c-format
msgid "could not write '%s'"
msgstr "incapaz escrever '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
-#: builtin/rebase.c:252
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
#, fuzzy, c-format
msgid "could not write '%s'."
msgstr "incapaz escrever '%s'."
-#: rebase-interactive.c:193
+#: rebase-interactive.c:196
#, fuzzy, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
@@ -5989,7 +6667,7 @@ msgstr ""
"Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
"Commits descartados (mais novo para o mais velho):\n"
-#: rebase-interactive.c:200
+#: rebase-interactive.c:203
#, fuzzy, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -6006,14 +6684,14 @@ msgstr ""
"O comportamentos possíveis são: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
-#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
-#: builtin/rebase.c:264
+#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
+#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
+#: builtin/rebase.c:265
#, c-format
msgid "could not read '%s'."
msgstr "incapaz ler '%s'."
-#: ref-filter.c:42 wt-status.c:1973
+#: ref-filter.c:42 wt-status.c:1978
msgid "gone"
msgstr "desapareceu"
@@ -6032,233 +6710,248 @@ msgstr "atrás %d"
msgid "ahead %d, behind %d"
msgstr "à frente %d, atrás %d"
-#: ref-filter.c:169
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<cor>)"
-#: ref-filter.c:171
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "cor desconhecida: %%(color:%s)"
-#: ref-filter.c:193
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor inteiro esperado refname:lstrip=%s"
-#: ref-filter.c:197
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor inteiro esperado refname:rstrip=%s"
-#: ref-filter.c:199
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento %%(%s) desconhecido: %s"
-#: ref-filter.c:254
+#: ref-filter.c:260
#, fuzzy, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) leva argumentos nenhuns"
-#: ref-filter.c:276
+#: ref-filter.c:282
#, fuzzy, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argumento %%(objectsize) desconhecido: %s"
-#: ref-filter.c:284
+#: ref-filter.c:290
#, fuzzy, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) leva argumentos nenhuns"
-#: ref-filter.c:296
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) leva argumentos nenhuns"
-#: ref-filter.c:309
+#: ref-filter.c:315
#, fuzzy, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argumento %%(subject) desconhecido: %s"
-#: ref-filter.c:330
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c:336
#, fuzzy, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argumento %%(trailers) desconhecido: %s"
-#: ref-filter.c:363
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:365
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %%(contents) desconhecido: %s"
-#: ref-filter.c:380
+#: ref-filter.c:384
#, fuzzy, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:384
+#: ref-filter.c:388
#, fuzzy, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argumento '%s' desconhecido em %%(%s)"
-#: ref-filter.c:398
+#: ref-filter.c:402
#, fuzzy, c-format
msgid "unrecognized email option: %s"
msgstr "opção de email desconhecida: %s"
-#: ref-filter.c:428
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<largura>,<posição>)"
-#: ref-filter.c:440
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "posição desconhecida: %s"
-#: ref-filter.c:447
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "largura desconhecida: %s"
-#: ref-filter.c:456
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento %%(align) desconhecido: %s"
-#: ref-filter.c:464
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "largura positiva esperada com o átomo %%(algn)"
-#: ref-filter.c:482
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento %%(if) desconhecido: %s"
-#: ref-filter.c:584
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "nome de ficheiro malformado: %.*s"
-#: ref-filter.c:611
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "nome do campo desconhecido: %.*s"
-#: ref-filter.c:615
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:739
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente"
-#: ref-filter.c:802
+#: ref-filter.c:807
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente"
-#: ref-filter.c:804
+#: ref-filter.c:809
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: átomo %%(then) utilizado mais que uma vez"
-#: ref-filter.c:806
+#: ref-filter.c:811
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) utilizado depois de %%(else)"
-#: ref-filter.c:834
+#: ref-filter.c:839
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente"
-#: ref-filter.c:836
+#: ref-filter.c:841
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente"
-#: ref-filter.c:838
+#: ref-filter.c:843
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: átomo %%(else) utilizado mais que uma vez"
-#: ref-filter.c:853
+#: ref-filter.c:858
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
-#: ref-filter.c:910
+#: ref-filter.c:915
#, c-format
msgid "malformed format string %s"
msgstr "cadeia malformada %s"
-#: ref-filter.c:1549
+#: ref-filter.c:1556
#, fuzzy, c-format
-msgid "no branch, rebasing %s"
+msgid "(no branch, rebasing %s)"
msgstr "(ramo nenhum, rebaseando %s)"
-#: ref-filter.c:1552
+#: ref-filter.c:1559
#, fuzzy, c-format
-msgid "no branch, rebasing detached HEAD %s"
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(ramo nenhum, rebaseando HEAD solta %s)"
-#: ref-filter.c:1555
+#: ref-filter.c:1562
#, fuzzy, c-format
-msgid "no branch, bisect started on %s"
+msgid "(no branch, bisect started on %s)"
msgstr "(ramo nenhum, bisseção iniciada em %s)"
-#: ref-filter.c:1565
+#: ref-filter.c:1566
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD destacada em %s)"
+
+#: ref-filter.c:1569
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD destacada de %s)"
+
+#: ref-filter.c:1572
#, fuzzy
-msgid "no branch"
+msgid "(no branch)"
msgstr "(ramo nenhum)"
-#: ref-filter.c:1599 ref-filter.c:1808
+#: ref-filter.c:1604 ref-filter.c:1813
#, c-format
msgid "missing object %s for %s"
msgstr "falta o objeto %s de %s"
-#: ref-filter.c:1609
+#: ref-filter.c:1614
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "falha ao invocar parse_object_buffer sobre %s de %s"
-#: ref-filter.c:2062
+#: ref-filter.c:1997
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado em '%s'"
-#: ref-filter.c:2151
+#: ref-filter.c:2086
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "a referência %s com nome danificado foi ignorada"
-#: ref-filter.c:2156 refs.c:660
+#: ref-filter.c:2091 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "a referência %s danificada foi ignorada"
-#: ref-filter.c:2472
+#: ref-filter.c:2431
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2571
+#: ref-filter.c:2525
#, c-format
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
-#: ref-filter.c:2576
+#: ref-filter.c:2530
#, fuzzy, c-format
msgid "option `%s' must point to a commit"
msgstr "opção '%s' tem apontar para um commit"
@@ -6268,65 +6961,80 @@ msgstr "opção '%s' tem apontar para um commit"
msgid "%s does not point to a valid object!"
msgstr "'%s' aponta para objeto válido nenhum!"
-#: refs.c:575
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+
+#: refs.c:588
#, fuzzy, c-format
msgid "could not retrieve `%s`"
msgstr "incapaz recuperar '%s'"
-#: refs.c:582
+#: refs.c:598
#, fuzzy, c-format
msgid "invalid branch name: %s = %s"
msgstr "Nome de ramo inválido: '%s'"
-#: refs.c:658
+#: refs.c:674
#, fuzzy, c-format
msgid "ignoring dangling symref %s"
msgstr "a referência %s danificada foi ignorada"
-#: refs.c:895
+#: refs.c:922
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:901
+#: refs.c:929
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:960
+#: refs.c:994
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1052
+#: refs.c:1086
#, fuzzy, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "a referência %s com nome danificado foi ignorada"
-#: refs.c:1123
+#: refs.c:1157
#, fuzzy, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "falha ao abrir '%s': %s"
-#: refs.c:1947
+#: refs.c:2051
#, fuzzy, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "atualizações múltiplas para ref '%s' proíbidas"
-#: refs.c:2027
+#: refs.c:2131
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2038
+#: refs.c:2142
msgid "ref updates aborted by hook"
msgstr ""
-#: refs.c:2138 refs.c:2168
+#: refs.c:2242 refs.c:2272
#, fuzzy, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; incapaz criar '%s'"
-#: refs.c:2144 refs.c:2179
+#: refs.c:2248 refs.c:2283
#, fuzzy, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "incapaz processar '%s' e '%s' ao mesmo tempo"
@@ -6390,12 +7098,12 @@ msgstr ""
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1073
+#: remote.c:1083
#, fuzzy, c-format
msgid "src refspec %s does not match any"
msgstr "src refspec %s corresponde a nenhum"
-#: remote.c:1078
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -6404,7 +7112,7 @@ msgstr ""
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1093
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6418,7 +7126,7 @@ msgid ""
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1113
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6426,7 +7134,7 @@ msgid ""
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1118
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6434,7 +7142,7 @@ msgid ""
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1123
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6442,7 +7150,7 @@ msgid ""
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1128
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6450,114 +7158,115 @@ msgid ""
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1164
+#: remote.c:1174
#, fuzzy, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s incapaz ser resolvido para ramo"
-#: remote.c:1175
+#: remote.c:1185
#, fuzzy, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "incapaz apagar '%s': ref remoto é inexistente"
-#: remote.c:1187
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1194
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1714 remote.c:1815
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD aponta para ramo nenhum"
-#: remote.c:1723
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "ramo inexistente: '%s'"
-#: remote.c:1726
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "configurado upstream nenhum para ramo '%s'"
-#: remote.c:1732
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "incapaz gravar ramo upstream '%s' como ramo remote-tracking"
-#: remote.c:1747
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
+msgstr ""
+"destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
-#: remote.c:1759
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "ramo '%s' tem remoto para atirar nenhum"
-#: remote.c:1769
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "refspecs de atirar para '%s'incluí '%s' nenhum"
-#: remote.c:1782
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "publicação sem destino (push.default é 'nothing')"
-#: remote.c:1804
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "incapaz resolver atiro 'simple' para destino único"
-#: remote.c:1933
+#: remote.c:1943
#, fuzzy, c-format
msgid "couldn't find remote ref %s"
msgstr "incapaz encontrar ref remoto %s"
-#: remote.c:1946
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2109
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
-#: remote.c:2113
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
-#: remote.c:2116
+#: remote.c:2126
#, fuzzy, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "O seu ramo está atualizado com '%s'.\n"
-#: remote.c:2120
+#: remote.c:2130
#, fuzzy, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "O seu ramo está à frente de '%s' por %d commit.\n"
-#: remote.c:2123
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2127
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "O seu ramo está à frente de '%s' por %d commit.\n"
msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
-#: remote.c:2133
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (use \"git push\" para publicar os commits locais)\n"
-#: remote.c:2136
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6569,11 +7278,11 @@ msgstr[1] ""
"O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
"avanço rápido.\n"
-#: remote.c:2144
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
-#: remote.c:2147
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6588,11 +7297,11 @@ msgstr[1] ""
"O seu ramo e '%s' divergiram,\n"
"tendo cada um %d e %d commits diferentes, respetivamente.\n"
-#: remote.c:2157
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
-#: remote.c:2348
+#: remote.c:2359
#, fuzzy, c-format
msgid "cannot parse expected object name '%s'"
msgstr "incapaz analisar nome de objeto esperado '%s'"
@@ -6612,97 +7321,97 @@ msgstr "eliminar referências substituídas"
msgid "replace depth too high for object %s"
msgstr "substituir a tag se esta existir"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr ""
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
#, fuzzy
msgid "unable to write rerere record"
msgstr "incapaz escrever registro rerere"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: rerere.c:498
+#: rerere.c:482
#, fuzzy, c-format
msgid "failed to flush '%s'"
msgstr "falha ao invocar stat de '%s'"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, fuzzy, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "incapaz analisar pedaços conflituosos em '%s'"
-#: rerere.c:684
+#: rerere.c:668
#, fuzzy, c-format
msgid "failed utime() on '%s'"
msgstr "falha ao abrir '%s'"
-#: rerere.c:694
+#: rerere.c:678
#, fuzzy, c-format
msgid "writing '%s' failed"
msgstr "falha ao criar '%s'"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr ""
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr ""
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: rerere.c:803
+#: rerere.c:787
#, fuzzy, c-format
msgid "cannot unlink stray '%s'"
msgstr "incapaz deslinkar o perdido '%s'"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
#, c-format
msgid "could not create directory '%s'"
msgstr "incapaz criar pasta '%s'"
-#: rerere.c:1057
+#: rerere.c:1041
#, fuzzy, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "falha ao criar a ligação '%s'"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, fuzzy, c-format
msgid "no remembered resolution for '%s'"
msgstr "a faltar a lembrança da solução para '%s'"
-#: rerere.c:1077
+#: rerere.c:1061
#, fuzzy, c-format
msgid "cannot unlink '%s'"
msgstr "incapaz de deslinkar '%s'"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr ""
-#: rerere.c:1096
+#: rerere.c:1080
#, fuzzy, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Está esquecida resolução para '%s'\n"
-#: rerere.c:1199
+#: rerere.c:1191
#, fuzzy
msgid "unable to open rr-cache directory"
msgstr "incapaz abrir pasta rr-cache"
@@ -6712,127 +7421,131 @@ msgstr "incapaz abrir pasta rr-cache"
msgid "could not determine HEAD revision"
msgstr "incapaz determinar revisão de HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3460
+#: reset.c:70 reset.c:76 sequencer.c:3669
#, fuzzy, c-format
msgid "failed to find tree of %s"
msgstr "Falha ao procurar árvore de %s."
-#: revision.c:2336
+#: revision.c:2343
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2356
-#, fuzzy, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "valor desconhecido '%s' da chave '%s'"
-
-#: revision.c:2694
+#: revision.c:2683
msgid "your current branch appears to be broken"
msgstr "o ramo atual parece estar danificado"
-#: revision.c:2697
+#: revision.c:2686
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "teu ramo atual '%s' ainda contém commits nenhuns"
-#: revision.c:2907
+#: revision.c:2892
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:764
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "falha ao abrir /dev/null"
-#: run-command.c:1271
+#: run-command.c:1275
#, fuzzy, c-format
msgid "cannot create async thread: %s"
msgstr "incapaz criar thread assíncrona: %s"
-#: run-command.c:1335
+#: run-command.c:1345
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:146
+#: send-pack.c:150
#, fuzzy
msgid "unexpected flush packet while reading remote unpack status"
msgstr "flush de pacotes inesperado enquanto lendo unpack status remoto"
-#: send-pack.c:148
+#: send-pack.c:152
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "incapaz analisar unpack status remota: %s"
-#: send-pack.c:150
+#: send-pack.c:154
#, c-format
msgid "remote unpack failed: %s"
msgstr "descompactação remota falhou: %s"
-#: send-pack.c:374
+#: send-pack.c:378
msgid "failed to sign the push certificate"
msgstr "falha ao assinar o certificado de publicação"
-#: send-pack.c:467
+#: send-pack.c:433
+#, fuzzy
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "fetch-pack: incapaz de aforquilhar %s"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+
+#: send-pack.c:520
#, fuzzy
msgid "the receiving end does not support this repository's hash algorithm"
msgstr "o recetor insustenta algoritmo hash deste repositório"
-#: send-pack.c:476
+#: send-pack.c:529
msgid "the receiving end does not support --signed push"
msgstr "o recetor insustenta atiro --signed"
-#: send-pack.c:478
+#: send-pack.c:531
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-"certificado de atiro por enviar uma vez que o recetor insustenta atiro"
-"com --signed"
+"certificado de atiro por enviar uma vez que o recetor insustenta atirocom --"
+"signed"
-#: send-pack.c:490
+#: send-pack.c:543
msgid "the receiving end does not support --atomic push"
msgstr "o recetor insustenta atiro com --atomic"
-#: send-pack.c:495
+#: send-pack.c:548
msgid "the receiving end does not support push options"
msgstr "o recetor insustenta opções de atiro"
-#: sequencer.c:195
+#: sequencer.c:196
#, fuzzy, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "Modo de limpeza inválido %s"
-#: sequencer.c:323
+#: sequencer.c:324
#, fuzzy, c-format
msgid "could not delete '%s'"
msgstr "incapaz de apagar '%s'"
-#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
#, c-format
msgid "could not remove '%s'"
msgstr "incapaz remover '%s'"
-#: sequencer.c:353
+#: sequencer.c:354
msgid "revert"
msgstr "reverter"
-#: sequencer.c:355
+#: sequencer.c:356
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:357
+#: sequencer.c:358
#, fuzzy
msgid "rebase"
msgstr "rebase -i"
-#: sequencer.c:359
+#: sequencer.c:360
#, fuzzy, c-format
msgid "unknown action: %d"
msgstr "Ação desconhecida: %d"
-#: sequencer.c:418
+#: sequencer.c:419
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6840,7 +7553,7 @@ msgstr ""
"depois de resolver os conflitos, marque os caminhos corrigidos\n"
"com 'git add <caminhos>' ou 'git rm <caminhos>'"
-#: sequencer.c:421
+#: sequencer.c:422
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6850,43 +7563,43 @@ msgstr ""
"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
"e submeta o resultado com 'git commit'"
-#: sequencer.c:434 sequencer.c:3062
+#: sequencer.c:435 sequencer.c:3271
#, c-format
msgid "could not lock '%s'"
msgstr "incapaz bloquear '%s'"
-#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
-#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
+#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
#, c-format
msgid "could not write to '%s'"
msgstr "incapaz escrever em '%s'"
-#: sequencer.c:441
+#: sequencer.c:442
#, c-format
msgid "could not write eol to '%s'"
msgstr "incapaz escrever fim de linha em '%s'"
-#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
-#: sequencer.c:3345
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3554
#, fuzzy, c-format
msgid "failed to finalize '%s'"
msgstr "falha ao finalizar '%s'."
-#: sequencer.c:485
+#: sequencer.c:486
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "as suas alterações locais serão substituídas ao %s."
-#: sequencer.c:489
+#: sequencer.c:490
msgid "commit your changes or stash them to proceed."
msgstr "submeta ou esconda as suas alterações para continuar."
-#: sequencer.c:521
+#: sequencer.c:522
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanço rápido"
-#: sequencer.c:560 builtin/tag.c:566
+#: sequencer.c:561 builtin/tag.c:609
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo de limpeza inválido %s"
@@ -6894,67 +7607,67 @@ msgstr "Modo de limpeza inválido %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:670
+#: sequencer.c:671
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escrever novo ficheiro index"
-#: sequencer.c:687
+#: sequencer.c:685
#, fuzzy
msgid "unable to update cache tree"
msgstr "incapaz atualizar árvore de cache"
-#: sequencer.c:701
+#: sequencer.c:699
#, fuzzy
msgid "could not resolve HEAD commit"
msgstr "incapaz resolver memória HEAD"
-#: sequencer.c:781
+#: sequencer.c:779
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:792
+#: sequencer.c:790
#, fuzzy, c-format
msgid "unable to dequote value of '%s'"
msgstr "incapaz retirar valor, da citação '%s'"
-#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
+#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
+#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "incapaz abrir '%s' para leitura"
-#: sequencer.c:839
+#: sequencer.c:837
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:844
+#: sequencer.c:842
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:849
+#: sequencer.c:847
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:853
+#: sequencer.c:851
#, fuzzy, c-format
msgid "unknown variable '%s'"
msgstr "Formato de arquivo desconhecido '%s'"
-#: sequencer.c:858
+#: sequencer.c:856
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:860
+#: sequencer.c:858
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:862
+#: sequencer.c:860
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:927
+#: sequencer.c:925
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6983,11 +7696,11 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:1208
+#: sequencer.c:1212
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1214
+#: sequencer.c:1218
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7013,7 +7726,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1227
+#: sequencer.c:1231
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7037,365 +7750,369 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1269
+#: sequencer.c:1273
msgid "couldn't look up newly created commit"
msgstr "incapaz consultar memória recém-criada"
-#: sequencer.c:1271
+#: sequencer.c:1275
msgid "could not parse newly created commit"
msgstr "incapaz analisar memória recém-criada"
-#: sequencer.c:1317
+#: sequencer.c:1321
#, fuzzy
msgid "unable to resolve HEAD after creating commit"
msgstr "incapaz resolver HEAD após criar memória"
-#: sequencer.c:1319
+#: sequencer.c:1323
msgid "detached HEAD"
msgstr "HEAD destacada"
-#: sequencer.c:1323
+#: sequencer.c:1327
msgid " (root-commit)"
msgstr " (commit-raiz)"
-#: sequencer.c:1344
+#: sequencer.c:1348
#, fuzzy
msgid "could not parse HEAD"
msgstr "incapaz processar HEAD"
-#: sequencer.c:1346
+#: sequencer.c:1350
#, fuzzy, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s é commit nenhum!"
-#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
msgid "could not parse HEAD commit"
msgstr "incapaz analisar commit HEAD"
-#: sequencer.c:1403 sequencer.c:2100
+#: sequencer.c:1410 sequencer.c:2295
#, fuzzy
msgid "unable to parse commit author"
msgstr "incapaz processar autor de commit"
-#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
+#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falhou ao escrever uma árvore"
-#: sequencer.c:1447 sequencer.c:1565
+#: sequencer.c:1454 sequencer.c:1574
#, fuzzy, c-format
msgid "unable to read commit message from '%s'"
msgstr "incapaz ler mensagem de commit de '%s'"
-#: sequencer.c:1476 sequencer.c:1508
+#: sequencer.c:1485 sequencer.c:1517
#, fuzzy, c-format
msgid "invalid author identity '%s'"
msgstr "caminho inválido '%s'"
-#: sequencer.c:1482
+#: sequencer.c:1491
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904
-#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
+#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "falha ao escrever objeto de commit"
-#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
#, c-format
msgid "could not update %s"
msgstr "incapaz atualizar %s"
-#: sequencer.c:1597
+#: sequencer.c:1606
#, fuzzy, c-format
msgid "could not parse commit %s"
msgstr "incapaz processar commit %s"
-#: sequencer.c:1602
+#: sequencer.c:1611
#, fuzzy, c-format
msgid "could not parse parent commit %s"
msgstr "incapaz processar commit parente %s"
-#: sequencer.c:1685 sequencer.c:1796
+#: sequencer.c:1694 sequencer.c:1975
#, c-format
msgid "unknown command: %d"
msgstr "comando desconhecido: %d"
-#: sequencer.c:1743 sequencer.c:1768
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Esta é a 1ª mensagem de commit:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Esta é a mensagem de commit nº%d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "A 1ª mensagem de commit será ignorada:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "A mensagem de commit #%d será ignorada:"
+
+#: sequencer.c:1740
#, c-format
msgid "This is a combination of %d commits."
msgstr "Isto é a combinação de %d commits."
-#: sequencer.c:1753
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "incapaz escrever '%s'"
+
+#: sequencer.c:1934
msgid "need a HEAD to fixup"
msgstr "necessária uma HEAD para fixup"
-#: sequencer.c:1755 sequencer.c:3372
+#: sequencer.c:1936 sequencer.c:3581
msgid "could not read HEAD"
msgstr "incapaz ler HEAD"
-#: sequencer.c:1757
+#: sequencer.c:1938
msgid "could not read HEAD's commit message"
msgstr "incapaz ler mensagem de commit de HEAD"
-#: sequencer.c:1763
-#, c-format
-msgid "cannot write '%s'"
-msgstr "incapaz escrever '%s'"
-
-#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
-msgid "This is the 1st commit message:"
-msgstr "Esta é a 1ª mensagem de commit:"
-
-#: sequencer.c:1778
+#: sequencer.c:1962
#, c-format
msgid "could not read commit message of %s"
msgstr "incapaz ler mensagem de commit de %s"
-#: sequencer.c:1785
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Esta é a mensagem de commit nº%d:"
-
-#: sequencer.c:1791
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "A mensagem de commit #%d será ignorada:"
-
-#: sequencer.c:1879
+#: sequencer.c:2072
msgid "your index file is unmerged."
msgstr "teu ficheiro índex está por juntar."
-#: sequencer.c:1886
+#: sequencer.c:2079
#, fuzzy
msgid "cannot fixup root commit"
msgstr "incapaz consertar commit raíz"
-#: sequencer.c:1905
+#: sequencer.c:2098
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "commit %s é uma junção mas foi fornecido opção -m nenhuma."
-#: sequencer.c:1913 sequencer.c:1921
+#: sequencer.c:2106 sequencer.c:2114
#, c-format
msgid "commit %s does not have parent %d"
msgstr "commit %s tem parente %d nenhum"
-#: sequencer.c:1927
+#: sequencer.c:2120
#, c-format
msgid "cannot get commit message for %s"
msgstr "incapaz obter mensagem de commit para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1946
+#: sequencer.c:2139
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: incapaz processar commit parente %s"
-#: sequencer.c:2011
+#: sequencer.c:2205
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "incapaz renomear '%s' para '%s'"
-#: sequencer.c:2071
+#: sequencer.c:2265
#, c-format
msgid "could not revert %s... %s"
msgstr "incapaz reverter %s... %s"
-#: sequencer.c:2072
+#: sequencer.c:2266
#, c-format
msgid "could not apply %s... %s"
msgstr "incapaz aplicar %s... %s"
-#: sequencer.c:2092
+#: sequencer.c:2287
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2150
+#: sequencer.c:2345
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falha ao ler o índice"
-#: sequencer.c:2157
+#: sequencer.c:2352
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falha ao atualizar o índice"
-#: sequencer.c:2234
+#: sequencer.c:2425
#, fuzzy, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s rejeita argumentos: '%s'"
-#: sequencer.c:2243
+#: sequencer.c:2434
#, fuzzy, c-format
msgid "missing arguments for %s"
msgstr "falta o objeto %s de %s"
-#: sequencer.c:2274
+#: sequencer.c:2477
#, fuzzy, c-format
msgid "could not parse '%s'"
msgstr "incapaz processar '%s'"
-#: sequencer.c:2335
+#: sequencer.c:2538
#, c-format
msgid "invalid line %d: %.*s"
msgstr "linha %d inválida: %.*s"
-#: sequencer.c:2346
+#: sequencer.c:2549
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "incapaz '%s' sem um commit anterior"
-#: sequencer.c:2432
+#: sequencer.c:2635
#, fuzzy
msgid "cancelling a cherry picking in progress"
msgstr "cancelando um cherry picking em curso"
-#: sequencer.c:2441
+#: sequencer.c:2644
#, fuzzy
msgid "cancelling a revert in progress"
msgstr "cancelando uma reversão em curso"
-#: sequencer.c:2485
+#: sequencer.c:2690
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corrija-o usando 'git rebase --edit-todo'."
-#: sequencer.c:2487
+#: sequencer.c:2692
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "folha de instruções inutilizável: '%s'"
-#: sequencer.c:2492
+#: sequencer.c:2697
msgid "no commits parsed."
msgstr "commits nenhuns analisados."
-#: sequencer.c:2503
+#: sequencer.c:2708
msgid "cannot cherry-pick during a revert."
msgstr "incapaz apanhar durante uma reversão."
-#: sequencer.c:2505
+#: sequencer.c:2710
msgid "cannot revert during a cherry-pick."
msgstr "incapaz reverter durante uma apanha."
-#: sequencer.c:2583
+#: sequencer.c:2788
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido de %s: %s"
-#: sequencer.c:2690
+#: sequencer.c:2897
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2710
+#: sequencer.c:2917
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "folha de opções malformada: '%s'"
-#: sequencer.c:2803 sequencer.c:4636
+#: sequencer.c:3012 sequencer.c:4869
msgid "empty commit set passed"
msgstr "o conjunto de commits especificado está vazio"
-#: sequencer.c:2820
+#: sequencer.c:3029
#, fuzzy
msgid "revert is already in progress"
msgstr "cherry-pick ou revert em curso"
-#: sequencer.c:2822
+#: sequencer.c:3031
#, fuzzy, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
-#: sequencer.c:2825
+#: sequencer.c:3034
#, fuzzy
msgid "cherry-pick is already in progress"
msgstr "cherry-pick ou revert em curso"
-#: sequencer.c:2827
+#: sequencer.c:3036
#, fuzzy, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
-#: sequencer.c:2841
+#: sequencer.c:3050
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "incapaz criar pasta do sequenciador '%s'"
-#: sequencer.c:2856
+#: sequencer.c:3065
msgid "could not lock HEAD"
msgstr "incapaz bloquear HEAD"
-#: sequencer.c:2916 sequencer.c:4371
+#: sequencer.c:3125 sequencer.c:4582
msgid "no cherry-pick or revert in progress"
msgstr "sem cherry-pick ou revert em curso"
-#: sequencer.c:2918 sequencer.c:2929
+#: sequencer.c:3127 sequencer.c:3138
msgid "cannot resolve HEAD"
msgstr "incapaz resolver HEAD"
-#: sequencer.c:2920 sequencer.c:2964
+#: sequencer.c:3129 sequencer.c:3173
msgid "cannot abort from a branch yet to be born"
msgstr "incapaz abortar de um ramo ainda por nascer"
-#: sequencer.c:2950 builtin/grep.c:756
+#: sequencer.c:3159 builtin/grep.c:759
#, c-format
msgid "cannot open '%s'"
msgstr "incapaz abrir '%s'"
-#: sequencer.c:2952
+#: sequencer.c:3161
#, c-format
msgid "cannot read '%s': %s"
msgstr "incapaz ler '%s': %s"
-#: sequencer.c:2953
+#: sequencer.c:3162
msgid "unexpected end of file"
msgstr "fim de ficheiro inesperado"
-#: sequencer.c:2959
+#: sequencer.c:3168
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
-#: sequencer.c:2970
+#: sequencer.c:3179
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifique a tua HEAD!"
-#: sequencer.c:3011
+#: sequencer.c:3220
#, fuzzy
msgid "no revert in progress"
msgstr "em curso reversão nenhuma"
-#: sequencer.c:3020
+#: sequencer.c:3229
#, fuzzy
msgid "no cherry-pick in progress"
msgstr "cherry-pick nenhum em curso"
-#: sequencer.c:3030
+#: sequencer.c:3239
#, fuzzy
msgid "failed to skip the commit"
msgstr "falha ao escrever objeto de commit"
-#: sequencer.c:3037
+#: sequencer.c:3246
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:3040
+#: sequencer.c:3249
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3202 sequencer.c:4263
+#: sequencer.c:3411 sequencer.c:4473
msgid "cannot read HEAD"
msgstr "incapaz ler HEAD"
-#: sequencer.c:3219
+#: sequencer.c:3428
#, fuzzy, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "incapaz copiar '%s' para '%s'"
-#: sequencer.c:3227
+#: sequencer.c:3436
#, fuzzy, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7414,27 +8131,27 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:3237
+#: sequencer.c:3446
#, fuzzy, c-format
msgid "Could not apply %s... %.*s"
msgstr "Incapaz aplicar %s... %.*s"
-#: sequencer.c:3244
+#: sequencer.c:3453
#, fuzzy, c-format
msgid "Could not merge %.*s"
msgstr "Incapaz juntar %.*s"
-#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "incapaz copiar '%s' para '%s'"
-#: sequencer.c:3274
+#: sequencer.c:3483
#, fuzzy, c-format
msgid "Executing: %s\n"
msgstr "A executar: %s\n"
-#: sequencer.c:3289
+#: sequencer.c:3498
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7449,11 +8166,11 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3295
+#: sequencer.c:3504
msgid "and made changes to the index and/or the working tree\n"
msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n"
-#: sequencer.c:3301
+#: sequencer.c:3510
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7470,94 +8187,94 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3362
+#: sequencer.c:3571
#, fuzzy, c-format
msgid "illegal label name: '%.*s'"
msgstr "nome de ficheiro malformado: %.*s"
-#: sequencer.c:3416
+#: sequencer.c:3625
#, fuzzy
msgid "writing fake root commit"
msgstr "escrevendo commit de raíz falso"
-#: sequencer.c:3421
+#: sequencer.c:3630
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3505
+#: sequencer.c:3714
#, fuzzy, c-format
msgid "could not resolve '%s'"
msgstr "incapaz resolver '%s'"
-#: sequencer.c:3538
+#: sequencer.c:3747
#, fuzzy
msgid "cannot merge without a current revision"
msgstr "incapaz juntar sem uma revisão currente"
-#: sequencer.c:3560
+#: sequencer.c:3769
#, fuzzy, c-format
msgid "unable to parse '%.*s'"
msgstr "incapaz processar '%.*s'"
-#: sequencer.c:3569
+#: sequencer.c:3778
#, fuzzy, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada a juntar: '%.*s'"
-#: sequencer.c:3581
+#: sequencer.c:3790
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3597
+#: sequencer.c:3806
#, fuzzy, c-format
msgid "could not get commit message of '%s'"
msgstr "incapaz obter mensagem de commit de '%s'"
-#: sequencer.c:3780
+#: sequencer.c:3989
#, fuzzy, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "incapaz de tentar juntar '%.*s'"
-#: sequencer.c:3796
+#: sequencer.c:4005
#, fuzzy
msgid "merge: Unable to write new index file"
msgstr "merge: Incapaz de escrever novo ficheiro index"
-#: sequencer.c:3870
+#: sequencer.c:4079
msgid "Cannot autostash"
msgstr "Incapaz de arrumar automaticamente (autostash)"
-#: sequencer.c:3873
+#: sequencer.c:4082
#, fuzzy, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Resposta de squash inexperada: '%s'"
-#: sequencer.c:3879
+#: sequencer.c:4088
#, fuzzy, c-format
msgid "Could not create directory for '%s'"
msgstr "Incapaz de criar a pasta para '%s'"
-#: sequencer.c:3882
+#: sequencer.c:4091
#, fuzzy, c-format
msgid "Created autostash: %s\n"
msgstr "Criado autostash: %s\n"
-#: sequencer.c:3886
+#: sequencer.c:4095
#, fuzzy
msgid "could not reset --hard"
msgstr "incapaz repor --hard"
-#: sequencer.c:3911
+#: sequencer.c:4120
#, fuzzy, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:3923
+#: sequencer.c:4132
#, c-format
msgid "cannot store %s"
msgstr "incapaz guardar %s"
-#: sequencer.c:3926
+#: sequencer.c:4135
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -7568,30 +8285,30 @@ msgstr ""
"As suas alterações estão guardadas na pilha.\n"
"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-#: sequencer.c:3931
+#: sequencer.c:4140
#, fuzzy
msgid "Applying autostash resulted in conflicts."
msgstr "Patch aplicado a '%s' com conflitos."
-#: sequencer.c:3932
+#: sequencer.c:4141
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "incapaz soltar HEAD"
-#: sequencer.c:4040
+#: sequencer.c:4249
#, fuzzy, c-format
msgid "Stopped at HEAD\n"
msgstr "Parou no HEAD\n"
-#: sequencer.c:4042
+#: sequencer.c:4251
#, fuzzy, c-format
msgid "Stopped at %s\n"
msgstr "Parou a %s... %.*s\n"
-#: sequencer.c:4050
+#: sequencer.c:4259
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7604,58 +8321,58 @@ msgid ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4096
+#: sequencer.c:4305
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4141
+#: sequencer.c:4351
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Parou no %s... %.*s\n"
-#: sequencer.c:4212
+#: sequencer.c:4422
#, c-format
msgid "unknown command %d"
msgstr "comando desconhecido %d"
-#: sequencer.c:4271
+#: sequencer.c:4481
msgid "could not read orig-head"
msgstr "incapaz ler orig-head"
-#: sequencer.c:4276
+#: sequencer.c:4486
msgid "could not read 'onto'"
msgstr "incapaz ler 'onto'"
-#: sequencer.c:4290
+#: sequencer.c:4500
#, c-format
msgid "could not update HEAD to %s"
msgstr "incapaz atualizar HEAD para %s"
-#: sequencer.c:4350
+#: sequencer.c:4560
#, fuzzy, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
-#: sequencer.c:4383
+#: sequencer.c:4612
msgid "cannot rebase: You have unstaged changes."
msgstr "incapaz rebasear: tem alterações despreparadas."
-#: sequencer.c:4392
+#: sequencer.c:4621
msgid "cannot amend non-existing commit"
msgstr "incapaz emendar commit inexistente"
-#: sequencer.c:4394
+#: sequencer.c:4623
#, c-format
msgid "invalid file: '%s'"
msgstr "ficheiro inválido: '%s'"
-#: sequencer.c:4396
+#: sequencer.c:4625
#, c-format
msgid "invalid contents: '%s'"
msgstr "conteúdo inválido: '%s'"
-#: sequencer.c:4399
+#: sequencer.c:4628
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7665,52 +8382,52 @@ msgstr ""
"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
"e execute 'git rebase --continue' de novo."
-#: sequencer.c:4435 sequencer.c:4474
+#: sequencer.c:4664 sequencer.c:4703
#, fuzzy, c-format
msgid "could not write file: '%s'"
msgstr "incapaz escrever ficheiro: '%s'"
-#: sequencer.c:4490
+#: sequencer.c:4719
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "incapaz remover CHERRY_PICK_HEAD"
-#: sequencer.c:4497
+#: sequencer.c:4726
msgid "could not commit staged changes."
msgstr "incapaz commit alterações preparadas."
-#: sequencer.c:4613
+#: sequencer.c:4846
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: incapaz apanhar um %s"
-#: sequencer.c:4617
+#: sequencer.c:4850
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:4652
+#: sequencer.c:4885
msgid "can't revert as initial commit"
msgstr "incapaz reverter como commit inicial"
-#: sequencer.c:5129
+#: sequencer.c:5362
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5132
+#: sequencer.c:5365
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5374 sequencer.c:5391
+#: sequencer.c:5615 sequencer.c:5632
#, fuzzy
msgid "nothing to do"
msgstr "nada a fazer"
-#: sequencer.c:5410
+#: sequencer.c:5651
#, fuzzy
msgid "could not skip unnecessary pick commands"
msgstr "incapaz de saltar comandos pick desnecessários"
-#: sequencer.c:5504
+#: sequencer.c:5751
msgid "the script was already rearranged."
msgstr ""
@@ -7855,10 +8572,10 @@ msgid ""
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
"é repositório git nenhum (ou em pai nenhum até ao ponto de montagem %s)\n"
-"Parando na fronteira do sistema de ficheiros (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"indefinido)."
+"Parando na fronteira do sistema de ficheiros "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)."
-#: setup.c:1362
+#: setup.c:1370
#, fuzzy, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7867,419 +8584,73 @@ msgstr ""
"Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
"O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
-#: setup.c:1409
+#: setup.c:1417
#, fuzzy
msgid "open /dev/null or dup failed"
msgstr "falha ao abrir /dev/null"
-#: setup.c:1424
+#: setup.c:1432
#, fuzzy
msgid "fork failed"
msgstr "falha ao invocar fseek"
-#: setup.c:1429
+#: setup.c:1437 t/helper/test-simple-ipc.c:285
#, fuzzy
msgid "setsid failed"
msgstr "falha ao executar o comando stash"
-#: sha1-file.c:480
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: sha1-file.c:531
-#, fuzzy, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "incapaz normalizar path de objeto alternativo: %s"
-
-#: sha1-file.c:603
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: sha1-file.c:610
-#, fuzzy, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "incapaz normalizar pasta de objeto: %s"
-
-#: sha1-file.c:653
-#, fuzzy
-msgid "unable to fdopen alternates lockfile"
-msgstr "incapaz de fdopen lockfile alternativo"
-
-#: sha1-file.c:671
-#, fuzzy
-msgid "unable to read alternates file"
-msgstr "incapaz ler ficheiro alternativo"
-
-#: sha1-file.c:678
-#, fuzzy
-msgid "unable to move new alternates file into place"
-msgstr "incapaz mover novo ficheiro alternativo para o sítio"
-
-#: sha1-file.c:713
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "caminho '%s' é inexistente"
-
-#: sha1-file.c:734
-#, 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."
-
-#: sha1-file.c:740
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "repositório referência '%s' é repositório local nenhum."
-
-#: sha1-file.c:746
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "o repositório de referência '%s' é raso"
-
-#: sha1-file.c:754
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "o repositório de referência '%s' está enxertado"
-
-#: sha1-file.c:814
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: sha1-file.c:964
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: sha1-file.c:985
-#, fuzzy
-msgid "mmap failed"
-msgstr "%s falhou"
-
-#: sha1-file.c:1149
-#, fuzzy, c-format
-msgid "object file %s is empty"
-msgstr "objeto local %s corrompido"
-
-#: sha1-file.c:1284 sha1-file.c:2477
-#, fuzzy, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objeto solto '%s' corrupto"
-
-#: sha1-file.c:1286 sha1-file.c:2481
-#, fuzzy, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "lixo no fim de objeto solto '%s'"
-
-#: sha1-file.c:1328
-#, fuzzy
-msgid "invalid object type"
-msgstr "tipo de objeto incorreto."
-
-#: sha1-file.c:1412
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1415
-#, fuzzy, c-format
-msgid "unable to unpack %s header"
-msgstr "incapaz desempacotar cabeçalho %s"
-
-#: sha1-file.c:1421
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1424
-#, fuzzy, c-format
-msgid "unable to parse %s header"
-msgstr "incapaz processar cabeçalho %s"
-
-#: sha1-file.c:1651
-#, fuzzy, c-format
-msgid "failed to read object %s"
-msgstr "falha ao ler o objeto '%s'."
-
-#: sha1-file.c:1655
-#, fuzzy, c-format
-msgid "replacement %s not found for %s"
-msgstr "%s substituto, por encontrar para %s"
-
-#: sha1-file.c:1659
-#, fuzzy, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "objeto local %s corrompido"
-
-#: sha1-file.c:1663
-#, fuzzy, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "objeto local %s corrompido"
-
-#: sha1-file.c:1768
-#, fuzzy, c-format
-msgid "unable to write file %s"
-msgstr "incapaz escrever ficheiro %s"
-
-#: sha1-file.c:1775
-#, fuzzy, c-format
-msgid "unable to set permission to '%s'"
-msgstr "incapaz definir permissão para '%s'"
-
-#: sha1-file.c:1782
-#, fuzzy
-msgid "file write error"
-msgstr "falha ao escrever para rev-list"
-
-#: sha1-file.c:1802
-#, fuzzy
-msgid "error when closing loose object file"
-msgstr "erro ao fechar ficheiro de pacote"
-
-#: sha1-file.c:1867
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: sha1-file.c:1869
-#, fuzzy
-msgid "unable to create temporary file"
-msgstr "incapaz criar ficheiro temporário"
-
-#: sha1-file.c:1893
-#, fuzzy
-msgid "unable to write loose object file"
-msgstr "incapaz escrever ficheiro objeto solto"
-
-#: sha1-file.c:1899
-#, fuzzy, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "incapaz esvaziar objeto novo %s (%d)"
-
-#: sha1-file.c:1903
-#, fuzzy, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "falha de fstat de %s"
-
-#: sha1-file.c:1907
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: sha1-file.c:1917 builtin/pack-objects.c:1086
-#, fuzzy, c-format
-msgid "failed utime() on %s"
-msgstr "falha ao abrir '%s'"
-
-#: sha1-file.c:1994
-#, fuzzy, c-format
-msgid "cannot read object for %s"
-msgstr "incapaz ler objeto para %s"
-
-#: sha1-file.c:2045
-#, fuzzy
-msgid "corrupt commit"
-msgstr "substituir autor do commit"
-
-#: sha1-file.c:2053
-#, fuzzy
-msgid "corrupt tag"
-msgstr "mostrar tags"
-
-#: sha1-file.c:2153
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: sha1-file.c:2156
-#, fuzzy, c-format
-msgid "short read while indexing %s"
-msgstr "leitura curta enquanto indexando %s"
-
-#: sha1-file.c:2229 sha1-file.c:2239
-#, fuzzy, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: falhou inserir na base de dados"
-
-#: sha1-file.c:2245
-#, fuzzy, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: tipo ficheiro insustentado"
-
-#: sha1-file.c:2269
-#, fuzzy, c-format
-msgid "%s is not a valid object"
-msgstr "%s é objeto inválido"
-
-#: sha1-file.c:2271
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s é um objeto inválido '%s'"
-
-#: sha1-file.c:2298 builtin/index-pack.c:192
-#, c-format
-msgid "unable to open %s"
-msgstr "incapaz abrir %s"
-
-#: sha1-file.c:2488 sha1-file.c:2541
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
+#: sparse-index.c:151
+msgid "attempting to use sparse-index without cone mode"
msgstr ""
-#: sha1-file.c:2512
-#, fuzzy, c-format
-msgid "unable to mmap %s"
-msgstr "incapaz mmap %s"
-
-#: sha1-file.c:2517
-#, fuzzy, c-format
-msgid "unable to unpack header of %s"
-msgstr "incapaz desempacotar cabeçalho de %s"
-
-#: sha1-file.c:2523
-#, fuzzy, c-format
-msgid "unable to parse header of %s"
-msgstr "incapaz processar cabeçalho de %s"
-
-#: sha1-file.c:2534
-#, fuzzy, c-format
-msgid "unable to unpack contents of %s"
-msgstr "incapaz desempacotar conteúdo de %s"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "SHA1 curto %s é ambíguo"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Os candidatos são:"
-
-#: sha1-name.c:796
+#: sparse-index.c:156
#, 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\""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: sha1-name.c:1702
-#, fuzzy, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-
-#: sha1-name.c:1708
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1717
-#, fuzzy, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "caminho '%s' é inexistente em '%.*s'"
-
-#: sha1-name.c:1745
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: sha1-name.c:1761
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
+msgid "unable to update cache-tree, staying full"
+msgstr "incapaz atualizar árvore de cache"
-#: sha1-name.c:1769
+#: sparse-index.c:239
#, c-format
-msgid "path '%s' exists on disk, but not in the index"
+msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
-#: sha1-name.c:1771
-#, 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)"
-
-#: sha1-name.c:1784
-#, 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"
-
-#: sha1-name.c:1922
-#, fuzzy, c-format
-msgid "invalid object name '%.*s'."
-msgstr "Nome de objeto inválido: '%s'."
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
+#: strbuf.c:852
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
+#: strbuf.c:862
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
+#: strbuf.c:871
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
+#: strbuf.c:877
#, fuzzy, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8287,20 +8658,20 @@ msgstr[0] "bytes"
msgstr[1] "bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
+#: strbuf.c:879
#, fuzzy, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "bytes"
msgstr[1] "bytes"
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
-#: builtin/rebase.c:864
+#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
+#: builtin/rebase.c:866
#, c-format
msgid "could not open '%s' for writing"
msgstr "incapaz abrir '%s' para escrita"
-#: strbuf.c:1175
+#: strbuf.c:1177
#, fuzzy, c-format
msgid "could not edit '%s'"
msgstr "incapaz editar '%s'"
@@ -8332,8 +8703,9 @@ msgstr "Incapaz de atualizar entrada de .gitmodules %s"
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "Incapaz de alterar .gitmodules por juntar, resolve os conflitos "
-"de junção primeiro"
+msgstr ""
+"Incapaz de alterar .gitmodules por juntar, resolve os conflitos de junção "
+"primeiro"
#: submodule.c:118 submodule.c:147
#, c-format
@@ -8349,72 +8721,72 @@ msgstr "Incapaz de remover a entrada de .gitmodules para %s"
msgid "staging updated .gitmodules failed"
msgstr "falha ao preparar .gitmodules atualizado"
-#: submodule.c:327
+#: submodule.c:328
#, fuzzy, c-format
msgid "in unpopulated submodule '%s'"
msgstr "A ignorar submódulo '%s'"
-#: submodule.c:358
+#: submodule.c:359
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-#: submodule.c:434
+#: submodule.c:436
#, fuzzy, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
-#: submodule.c:816
+#: submodule.c:818
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-#: submodule.c:919
+#: submodule.c:921
#, fuzzy, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit"
-#: submodule.c:1004
+#: submodule.c:1006
#, fuzzy, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' em"
-"submódulo %s"
+"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' "
+"emsubmódulo %s"
-#: submodule.c:1127
+#: submodule.c:1129
#, fuzzy, c-format
msgid "process for submodule '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
+#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
-#: submodule.c:1167
+#: submodule.c:1169
#, fuzzy, c-format
msgid "Pushing submodule '%s'\n"
msgstr "A ignorar submódulo '%s'\n"
-#: submodule.c:1170
+#: submodule.c:1172
#, fuzzy, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossível enviar submódulo '%s'\n"
-#: submodule.c:1462
+#: submodule.c:1464
#, fuzzy, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Buscando submódulo %s%s\n"
-#: submodule.c:1492
+#: submodule.c:1498
#, fuzzy, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Submódulo '%s' inacessível\n"
-#: submodule.c:1646
+#: submodule.c:1653
#, fuzzy, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8423,79 +8795,79 @@ msgstr ""
"Erros na busca do submódulo:\n"
"%s"
-#: submodule.c:1671
+#: submodule.c:1678
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' é irreconhecível como um repositório git"
-#: submodule.c:1688
+#: submodule.c:1695
#, fuzzy, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Incapaz executar 'git status' no submódulo '%s'"
-#: submodule.c:1729
+#: submodule.c:1736
#, fuzzy, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' falhou no submódulo '%s'"
-#: submodule.c:1804
+#: submodule.c:1811
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "incapaz iniciar 'git status' no submódulo '%s'"
-#: submodule.c:1817
+#: submodule.c:1824
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "incapaz executar 'git status' no submódulo '%s'"
-#: submodule.c:1832
+#: submodule.c:1839
#, fuzzy, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Incapaz de remover a definição core.worktree em submódulo '%s'"
-#: submodule.c:1859 submodule.c:2169
+#: submodule.c:1866 submodule.c:2176
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "incapaz percorrer recursivamente o submódulo '%s'"
-#: submodule.c:1880
+#: submodule.c:1887
#, fuzzy
msgid "could not reset submodule index"
-msgstr "incapaz repor index de submódulo"
+msgstr "incapaz repor index de submódulo"
-#: submodule.c:1922
+#: submodule.c:1929
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "o submódulo '%s' tem índice sujo"
-#: submodule.c:1974
+#: submodule.c:1981
#, fuzzy, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' incapaz de ser atualizado."
-#: submodule.c:2042
+#: submodule.c:2049
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
-#: submodule.c:2063
+#: submodule.c:2070
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
"relocate_gitdir para submodúlo '%s' com mais que uma worktree é insustentado"
-#: submodule.c:2075 submodule.c:2134
+#: submodule.c:2082 submodule.c:2141
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "incapaz procurar nome para submódulo '%s'"
-#: submodule.c:2079
+#: submodule.c:2086
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
-#: submodule.c:2086
+#: submodule.c:2093
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8506,65 +8878,71 @@ msgstr ""
"'%s' para\n"
"'%s'\n"
-#: submodule.c:2214
+#: submodule.c:2221
msgid "could not start ls-files in .."
msgstr "incapaz iniciar ls-files em .."
-#: submodule.c:2254
+#: submodule.c:2261
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree retornou código de retorno inesperado %d"
-#: trailer.c:236
+#: symlinks.c:244
+#, fuzzy, c-format
+msgid "failed to lstat '%s'"
+msgstr "falha ao invocar stat de '%s'"
+
+#: trailer.c:244
#, c-format
msgid "running trailer command '%s' failed"
msgstr "falha ao executar o comando trailer '%s'"
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconhecido '%s' da chave '%s'"
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:324
#, c-format
msgid "more than one %s"
msgstr "mais do que um %s"
-#: trailer.c:728
+#: trailer.c:743
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "token terminador vazio no terminador '%.*s'"
-#: trailer.c:748
+#: trailer.c:763
#, c-format
msgid "could not read input file '%s'"
msgstr "incapaz ler ficheiro de entrada '%s'"
-#: trailer.c:751
+#: trailer.c:766 builtin/mktag.c:88
msgid "could not read from stdin"
msgstr "incapaz ler da entrada padrão"
-#: trailer.c:1009 wrapper.c:676
+#: trailer.c:1024 wrapper.c:676
#, c-format
msgid "could not stat %s"
msgstr "incapaz obter estatutário %s"
-#: trailer.c:1011
+#: trailer.c:1026
#, c-format
msgid "file %s is not a regular file"
msgstr "ficheiro %s é ficheiro regular nenhum"
-#: trailer.c:1013
+#: trailer.c:1028
#, c-format
msgid "file %s is not writable by user"
msgstr "ficheiro %s é não-escrevível para utilizador"
-#: trailer.c:1025
+#: trailer.c:1040
msgid "could not open temporary file"
msgstr "incapaz abrir ficheiro temporário"
-#: trailer.c:1065
+#: trailer.c:1080
#, c-format
msgid "could not rename temporary file to %s"
msgstr "incapaz renomear ficheiro temporário para %s"
@@ -8607,14 +8985,14 @@ msgstr "%s também trancou %s"
#: transport-helper.c:497
#, fuzzy
msgid "couldn't run fast-import"
-msgstr "incapaz executar fast-import"
+msgstr "incapaz executar fast-import"
#: transport-helper.c:520
#, fuzzy
msgid "error while running fast-import"
msgstr "erro ao fechar ficheiro de pacote"
-#: transport-helper.c:549 transport-helper.c:1236
+#: transport-helper.c:549 transport-helper.c:1247
#, fuzzy, c-format
msgid "could not read ref %s"
msgstr "incapaz de ler ref %s"
@@ -8633,7 +9011,7 @@ msgstr ""
msgid "invalid remote service path"
msgstr "referência inválida: %s"
-#: transport-helper.c:661 transport.c:1446
+#: transport-helper.c:661 transport.c:1471
#, fuzzy
msgid "operation not supported by protocol"
msgstr "opção insustentado pelo protocolo"
@@ -8643,122 +9021,126 @@ msgstr "opção insustentado pelo protocolo"
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:745
+#: transport-helper.c:693 transport.c:397
+msgid "--negotiate-only requires protocol v2"
+msgstr ""
+
+#: transport-helper.c:755
msgid "'option' without a matching 'ok/error' directive"
msgstr ""
-#: transport-helper.c:788
+#: transport-helper.c:798
#, fuzzy, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "blob para %s '%s' esperado"
-#: transport-helper.c:845
+#: transport-helper.c:855
#, fuzzy, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportou código de status inesperado de %s"
-#: transport-helper.c:928
+#: transport-helper.c:938
#, fuzzy, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s insustenta dry-run"
-#: transport-helper.c:931
+#: transport-helper.c:941
#, fuzzy, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s insustenta --signed"
-#: transport-helper.c:934
+#: transport-helper.c:944
#, fuzzy, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s insustenta --signed=if-asked"
-#: transport-helper.c:939
+#: transport-helper.c:949
#, fuzzy, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s insustenta --atomic"
-#: transport-helper.c:943
+#: transport-helper.c:953
#, fuzzy, c-format
msgid "helper %s does not support --%s"
msgstr "helper %s insustenta --%s"
-#: transport-helper.c:950
+#: transport-helper.c:960
#, fuzzy, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s insustenta 'push-option'"
-#: transport-helper.c:1050
+#: transport-helper.c:1060
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:1055
+#: transport-helper.c:1065
#, fuzzy, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s insustenta 'force'"
-#: transport-helper.c:1102
+#: transport-helper.c:1112
#, fuzzy
msgid "couldn't run fast-export"
msgstr "incapaz executar fast-export"
-#: transport-helper.c:1107
+#: transport-helper.c:1117
#, fuzzy
msgid "error while running fast-export"
msgstr "erro ao fechar ficheiro de pacote"
-#: transport-helper.c:1132
+#: transport-helper.c:1142
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch.\n"
msgstr ""
-#: transport-helper.c:1213
+#: transport-helper.c:1224
#, fuzzy, c-format
msgid "unsupported object format '%s'"
msgstr "objeto malformado em '%s'"
-#: transport-helper.c:1222
+#: transport-helper.c:1233
#, fuzzy, c-format
msgid "malformed response in ref list: %s"
msgstr "folha de opções malformada: '%s'"
-#: transport-helper.c:1374
+#: transport-helper.c:1385
#, fuzzy, c-format
msgid "read(%s) failed"
msgstr "%s falhou"
-#: transport-helper.c:1401
+#: transport-helper.c:1412
#, fuzzy, c-format
msgid "write(%s) failed"
msgstr "%s falhou"
-#: transport-helper.c:1450
+#: transport-helper.c:1461
#, fuzzy, c-format
msgid "%s thread failed"
msgstr "%s falhou"
-#: transport-helper.c:1454
+#: transport-helper.c:1465
#, fuzzy, c-format
msgid "%s thread failed to join: %s"
msgstr "falha ao abrir '%s'"
-#: transport-helper.c:1473 transport-helper.c:1477
+#: transport-helper.c:1484 transport-helper.c:1488
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1514
+#: transport-helper.c:1525
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1518
+#: transport-helper.c:1529
#, fuzzy, c-format
msgid "%s process failed"
msgstr "%s falhou"
-#: transport-helper.c:1536 transport-helper.c:1545
+#: transport-helper.c:1547 transport-helper.c:1556
msgid "can't start thread for copying data"
msgstr ""
@@ -8777,38 +9159,43 @@ msgstr "incapaz ler conjunto '%s'"
msgid "transport: invalid depth option '%s'"
msgstr "transporte: opção de profundidade '%s' inválida"
-#: transport.c:269
+#: transport.c:272
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:270
+#: transport.c:273
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:727
+#: transport.c:400
+#, fuzzy
+msgid "server does not support wait-for-done"
+msgstr "Servidor insustenta --deepen"
+
+#: transport.c:751
#, fuzzy
msgid "could not parse transport.color.* config"
msgstr "incapaz processar config transport.color.*"
-#: transport.c:802
+#: transport.c:826
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:936
+#: transport.c:960
#, fuzzy, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconhecido '%s' da chave '%s'"
-#: transport.c:1002
+#: transport.c:1026
#, fuzzy, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' proibido"
-#: transport.c:1055
+#: transport.c:1079
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1157
+#: transport.c:1181
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8817,7 +9204,7 @@ msgstr ""
"Os seguintes paths de submódulo contêm alterações que\n"
"puderam ser encontradas em remoto nenhum:\n"
-#: transport.c:1161
+#: transport.c:1185
#, c-format
msgid ""
"\n"
@@ -8844,32 +9231,32 @@ msgstr ""
"para publicá-las no remoto.\n"
"\n"
-#: transport.c:1169
+#: transport.c:1193
msgid "Aborting."
msgstr "Abortado."
-#: transport.c:1315
+#: transport.c:1340
#, fuzzy
msgid "failed to push all needed submodules"
msgstr "Falha ao adicionar o submódulo '$sm_path'"
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "objeto árvore demasiado curto"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "modo na entrada de árvore malformado"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "nome de ficheiro vazio na entrada de árvore"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "ficheiro de árvore demasiado curto"
-#: unpack-trees.c:113
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8879,7 +9266,7 @@ msgstr ""
"extrair:\n"
"%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8889,7 +9276,7 @@ msgstr ""
"extrair:\n"
"%%s"
-#: unpack-trees.c:118
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8899,7 +9286,7 @@ msgstr ""
"integrar:\n"
"%%sSubmeta as suas alterações ou esconda-as antes de integrar."
-#: unpack-trees.c:120
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8909,7 +9296,7 @@ msgstr ""
"integrar:\n"
"%%s"
-#: unpack-trees.c:123
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8919,7 +9306,7 @@ msgstr ""
"%s:\n"
"%%sPor favor, faz commit ou stash às alterações antes de fazer %s."
-#: unpack-trees.c:125
+#: unpack-trees.c:127
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8929,7 +9316,7 @@ msgstr ""
"%s:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:132
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8938,7 +9325,7 @@ msgstr ""
"Atualizar as seguintes pastas fará perder os seus ficheiros por seguir:\n"
"%s"
-#: unpack-trees.c:134
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8947,7 +9334,7 @@ msgstr ""
"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n"
"%%sPor favor, move ou remove-os antes de trocar de ramos."
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8956,16 +9343,17 @@ msgstr ""
"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n"
"%%s"
-#: unpack-trees.c:139
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam removidos por uma junção:\n"
+"Os seguintes ficheiros por seguir da worktree seriam removidos por uma "
+"junção:\n"
"%%sPor favor, move ou remove-os antes da junção."
-#: unpack-trees.c:141
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8974,7 +9362,7 @@ msgstr ""
"Os seguintes ficheiros por seguir da worktree seriam removidos pela junção:\n"
"%%s"
-#: unpack-trees.c:144
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8983,39 +9371,39 @@ msgstr ""
"Os seguintes ficheiros por seguir da worktree seriam removidos por %s:\n"
"%%sPor favor, move ou remove-os antes de fazer %s."
-#: unpack-trees.c:146
+#: unpack-trees.c:148
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da árvore de trabalho seriam "
-"removidos por %s:\n"
+"Os seguintes ficheiros por seguir da árvore de trabalho seriam removidos por "
+"%s:\n"
"%%s"
-#: unpack-trees.c:152
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Os seguintes ficheiros por seguir da árvore de trabalho seriam "
-"substituídos por um checkout:\n"
+"Os seguintes ficheiros por seguir da árvore de trabalho seriam substituídos "
+"por um checkout:\n"
"%%sPor favor, move ou remove-os antes de trocar de ramos."
-#: unpack-trees.c:154
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos "
-"por checkout:\n"
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
+"checkout:\n"
"%%s"
-#: unpack-trees.c:157
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9025,7 +9413,7 @@ msgstr ""
"junção:\n"
"%%sPor favor, move ou remove-os antes de juntares."
-#: unpack-trees.c:159
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -9035,32 +9423,30 @@ msgstr ""
"junção:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
-"%s:\n"
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n"
"%%sPor favor, move ou remove-os antes de fazer %s."
-#: unpack-trees.c:164
+#: unpack-trees.c:166
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
-"%s:\n"
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n"
"%%s"
-#: unpack-trees.c:172
+#: unpack-trees.c:174
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Entrada '%s' sobrepõe-se a '%s'. Impossível vincular."
-#: unpack-trees.c:175
+#: unpack-trees.c:177
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9069,7 +9455,7 @@ msgstr ""
"Impossível atualizar submódulo:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:180
#, c-format
msgid ""
"The following paths are not up to date and were left despite sparse "
@@ -9077,7 +9463,7 @@ msgid ""
"%s"
msgstr ""
-#: unpack-trees.c:180
+#: unpack-trees.c:182
#, fuzzy, c-format
msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9087,7 +9473,7 @@ msgstr ""
"patterns:\n"
"%s"
-#: unpack-trees.c:182
+#: unpack-trees.c:184
#, c-format
msgid ""
"The following paths were already present and thus not updated despite sparse "
@@ -9095,36 +9481,41 @@ msgid ""
"%s"
msgstr ""
-#: unpack-trees.c:262
+#: unpack-trees.c:264
#, c-format
msgid "Aborting\n"
msgstr "A abortar\n"
-#: unpack-trees.c:289
+#: unpack-trees.c:291
#, c-format
msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-#: unpack-trees.c:350
+#: unpack-trees.c:352
#, fuzzy
msgid "Updating files"
msgstr "A atualizar %s"
-#: unpack-trees.c:382
+#: unpack-trees.c:384
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1498
+#: unpack-trees.c:1519
#, fuzzy
msgid "Updating index flags"
msgstr "A atualizar %s"
-#: upload-pack.c:1550
+#: unpack-trees.c:2608
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+
+#: upload-pack.c:1548
msgid "expected flush after fetch arguments"
msgstr ""
@@ -9162,78 +9553,115 @@ msgstr "segmento de caminho '..' inválido"
msgid "Fetching objects"
msgstr "A verificar objetos"
-#: worktree.c:236 builtin/am.c:2103
+#: worktree.c:238 builtin/am.c:2151
#, c-format
msgid "failed to read '%s'"
msgstr "falha ao ler '%s'"
-#: worktree.c:283
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:294
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:306
+#: worktree.c:327
#, fuzzy, c-format
msgid "'%s' does not exist"
msgstr "'%s' é inexistente"
-#: worktree.c:312
+#: worktree.c:333
#, fuzzy, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' é ficheiro .git nenhum, código de erro %d"
-#: worktree.c:321
+#: worktree.c:342
#, fuzzy, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' aponta para algo diferente de '%s'"
-#: worktree.c:587
+#: worktree.c:608
#, fuzzy
msgid "not a directory"
msgstr "é pasta nenhuma"
-#: worktree.c:596
+#: worktree.c:617
#, fuzzy
msgid ".git is not a file"
msgstr "git show %s: ficheiro incorreto"
-#: worktree.c:598
+#: worktree.c:619
msgid ".git file broken"
msgstr ""
-#: worktree.c:600
+#: worktree.c:621
#, fuzzy
msgid ".git file incorrect"
msgstr "ficheiro de índice corrompido"
-#: worktree.c:670
+#: worktree.c:727
#, fuzzy
msgid "not a valid path"
msgstr "nome de objeto inválido: %s"
-#: worktree.c:676
+#: worktree.c:733
#, fuzzy
msgid "unable to locate repository; .git is not a file"
msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
-#: worktree.c:679
+#: worktree.c:737
+#, fuzzy
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+
+#: worktree.c:741
#, fuzzy
msgid "unable to locate repository; .git file broken"
msgstr "incapaz localizar repositório; .git está quebrado"
-#: worktree.c:685
+#: worktree.c:747
msgid "gitdir unreadable"
msgstr ""
-#: worktree.c:689
+#: worktree.c:751
msgid "gitdir incorrect"
msgstr ""
+#: worktree.c:776
+#, fuzzy
+msgid "not a valid directory"
+msgstr "nome de objeto inválido: %s"
+
+#: worktree.c:782
+#, fuzzy
+msgid "gitdir file does not exist"
+msgstr "ficheiro gitdir é inexistente"
+
+#: worktree.c:787 worktree.c:796
+#, fuzzy, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "incapaz ler ficheiro gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+
+#: worktree.c:814
+#, fuzzy
+msgid "invalid gitdir file"
+msgstr "linha de Data inválida"
+
+#: worktree.c:822
+#, fuzzy
+msgid "gitdir file points to non-existent location"
+msgstr ""
+"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
+"inexistente"
+
#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
@@ -9280,11 +9708,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
-#: wt-status.c:211 wt-status.c:1070
+#: wt-status.c:211 wt-status.c:1075
msgid "Changes to be committed:"
msgstr "Alterações para serem submetidas:"
-#: wt-status.c:234 wt-status.c:1079
+#: wt-status.c:234 wt-status.c:1084
msgid "Changes not staged for commit:"
msgstr "Alterações por preparar para commit:"
@@ -9308,8 +9736,7 @@ msgstr ""
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (faz commit ou descarta o conteúdo por seguir ou modificado nos "
-"submódulos)"
+" (faz commit ou descarta o conteúdo por seguir ou modificado nos submódulos)"
#: wt-status.c:254
#, c-format
@@ -9388,22 +9815,22 @@ msgstr "conteúdo modificado, "
msgid "untracked content, "
msgstr "conteúdo por seguir, "
-#: wt-status.c:903
+#: wt-status.c:908
#, fuzzy, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Está a rebasear neste momento."
msgstr[1] "Está a rebasear neste momento."
-#: wt-status.c:934
+#: wt-status.c:939
msgid "Submodules changed but not updated:"
msgstr "Submódulos alterados mas desatualizados:"
-#: wt-status.c:936
+#: wt-status.c:941
msgid "Submodule changes to be committed:"
msgstr "Alterações em submódulos para serem submetidas:"
-#: wt-status.c:1018
+#: wt-status.c:1023
#, fuzzy
msgid ""
"Do not modify or remove the line above.\n"
@@ -9412,7 +9839,7 @@ msgstr ""
"Deixe estar a linha acima.\n"
"Tudo abaixo será ignorado."
-#: wt-status.c:1110
+#: wt-status.c:1115
#, c-format
msgid ""
"\n"
@@ -9420,108 +9847,108 @@ msgid ""
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: wt-status.c:1140
+#: wt-status.c:1145
msgid "You have unmerged paths."
msgstr "Tens paths por juntar."
-#: wt-status.c:1143
+#: wt-status.c:1148
msgid " (fix conflicts and run \"git commit\")"
msgstr " (corrija os conflitos e execute \"git commit\")"
-#: wt-status.c:1145
+#: wt-status.c:1150
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (use \"git am --abort\" para abortar a integração)"
-#: wt-status.c:1149
+#: wt-status.c:1154
msgid "All conflicts fixed but you are still merging."
msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-#: wt-status.c:1152
+#: wt-status.c:1157
msgid " (use \"git commit\" to conclude merge)"
msgstr " (use \"git commit\" para concluir a integração)"
-#: wt-status.c:1161
+#: wt-status.c:1166
msgid "You are in the middle of an am session."
msgstr "Sessão am em curso."
-#: wt-status.c:1164
+#: wt-status.c:1169
msgid "The current patch is empty."
msgstr "O patch atual está vazio."
-#: wt-status.c:1168
+#: wt-status.c:1173
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (corrija os conflitos e execute \"git am --continue\")"
-#: wt-status.c:1170
+#: wt-status.c:1175
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:1172
+#: wt-status.c:1177
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (use \"git am --abort\" para restaurar o ramo original)"
-#: wt-status.c:1305
+#: wt-status.c:1310
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo está faltando."
-#: wt-status.c:1307
+#: wt-status.c:1312
msgid "No commands done."
msgstr "Nenhum comando concluído."
-#: wt-status.c:1310
+#: wt-status.c:1315
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Último comando concluído (%d comando concluído):"
msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
-#: wt-status.c:1321
+#: wt-status.c:1326
#, c-format
msgid " (see more in file %s)"
msgstr " (veja mais no ficheiro %s)"
-#: wt-status.c:1326
+#: wt-status.c:1331
msgid "No commands remaining."
msgstr "Nenhum comando por concluir."
-#: wt-status.c:1329
+#: wt-status.c:1334
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Próximo comando a executar (%d comando restante):"
msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
-#: wt-status.c:1337
+#: wt-status.c:1342
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
-#: wt-status.c:1349
+#: wt-status.c:1354
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
-#: wt-status.c:1354
+#: wt-status.c:1359
msgid "You are currently rebasing."
msgstr "Está a rebasear neste momento."
-#: wt-status.c:1367
+#: wt-status.c:1372
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
-#: wt-status.c:1369
+#: wt-status.c:1374
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: wt-status.c:1371
+#: wt-status.c:1376
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
-#: wt-status.c:1378
+#: wt-status.c:1383
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
-#: wt-status.c:1382
+#: wt-status.c:1387
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9529,158 +9956,166 @@ msgstr ""
"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
"sobre '%s'."
-#: wt-status.c:1387
+#: wt-status.c:1392
msgid "You are currently splitting a commit during a rebase."
msgstr "Está a dividir um commit durante um rebase."
-#: wt-status.c:1390
+#: wt-status.c:1395
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
"continue\")"
-#: wt-status.c:1394
+#: wt-status.c:1399
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
"'%s'."
-#: wt-status.c:1399
+#: wt-status.c:1404
msgid "You are currently editing a commit during a rebase."
msgstr "Está a editar um commit durante um rebase."
-#: wt-status.c:1402
+#: wt-status.c:1407
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (use \"git commit --amend\" para emendar o commit atual)"
-#: wt-status.c:1404
+#: wt-status.c:1409
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (use \"git rebase --continue\" assim que estiver satisfeito com as "
"alterações)"
-#: wt-status.c:1415
+#: wt-status.c:1420
#, fuzzy
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick atualmente em curso"
-#: wt-status.c:1418
+#: wt-status.c:1423
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Está a realizar cherry-pick do commit %s."
-#: wt-status.c:1425
+#: wt-status.c:1430
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: wt-status.c:1428
+#: wt-status.c:1433
#, fuzzy
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: wt-status.c:1431
+#: wt-status.c:1436
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1433
+#: wt-status.c:1438
#, fuzzy
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:1435
+#: wt-status.c:1440
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
-#: wt-status.c:1445
+#: wt-status.c:1450
#, fuzzy
msgid "Revert currently in progress."
msgstr "abortar integração em curso"
-#: wt-status.c:1448
+#: wt-status.c:1453
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Está a reverter o commit %s neste comento."
-#: wt-status.c:1454
+#: wt-status.c:1459
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: wt-status.c:1457
+#: wt-status.c:1462
#, fuzzy
msgid " (run \"git revert --continue\" to continue)"
msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: wt-status.c:1460
+#: wt-status.c:1465
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
-#: wt-status.c:1462
+#: wt-status.c:1467
#, fuzzy
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: wt-status.c:1464
+#: wt-status.c:1469
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
-#: wt-status.c:1474
+#: wt-status.c:1479
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
-#: wt-status.c:1478
+#: wt-status.c:1483
msgid "You are currently bisecting."
msgstr "Está a bissetar neste momento."
-#: wt-status.c:1481
+#: wt-status.c:1486
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
-#: wt-status.c:1492
+#: wt-status.c:1497
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
-#: wt-status.c:1731
+#: wt-status.c:1736
msgid "On branch "
msgstr "No ramo "
-#: wt-status.c:1738
+#: wt-status.c:1743
msgid "interactive rebase in progress; onto "
msgstr "rebase interativo em curso; sobre "
-#: wt-status.c:1740
+#: wt-status.c:1745
msgid "rebase in progress; onto "
msgstr "rebase em curso; sobre "
#: wt-status.c:1750
+msgid "HEAD detached at "
+msgstr "HEAD destacada em "
+
+#: wt-status.c:1752
+msgid "HEAD detached from "
+msgstr "HEAD destacada de "
+
+#: wt-status.c:1755
msgid "Not currently on any branch."
msgstr "Atualmente em ramo nenhum."
-#: wt-status.c:1767
+#: wt-status.c:1772
msgid "Initial commit"
msgstr "Memória inicial"
-#: wt-status.c:1768
+#: wt-status.c:1773
#, fuzzy
msgid "No commits yet"
msgstr "Ainda commits nenhuns"
-#: wt-status.c:1782
+#: wt-status.c:1787
msgid "Untracked files"
msgstr "Ficheiros por seguir"
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "Ignored files"
msgstr "Ficheiros ignorados"
-#: wt-status.c:1788
+#: wt-status.c:1793
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9691,101 +10126,122 @@ msgstr ""
"'status -uno' pode-o acelerar, mas tens de te lembrar de adicionares\n"
"os novos ficheiros (vê 'git help status')."
-#: wt-status.c:1794
+#: wt-status.c:1799
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ficheiros por seguir fora da listagem%s"
-#: wt-status.c:1796
+#: wt-status.c:1801
msgid " (use -u option to show untracked files)"
msgstr " (usa opção -u para mostrar ficheiros por seguir)"
-#: wt-status.c:1802
+#: wt-status.c:1807
msgid "No changes"
msgstr "Sem alterações"
-#: wt-status.c:1807
+#: wt-status.c:1812
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git "
-"commit -a\")\n"
+msgstr ""
+"foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git commit "
+"-a\")\n"
-#: wt-status.c:1811
+#: wt-status.c:1816
#, c-format
msgid "no changes added to commit\n"
msgstr "foi adicionado a commit alteração nenhuma\n"
-#: wt-status.c:1815
+#: wt-status.c:1820
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"nada adicionado para commit mas há ficheiros por seguir presentes (usa"
-"(\"git add\" para seguir)\n"
+"nada adicionado para commit mas há ficheiros por seguir presentes (usa(\"git "
+"add\" para seguir)\n"
-#: wt-status.c:1819
+#: wt-status.c:1824
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nada adicionado para commit mas ficheiros por seguir presentes\n"
-#: wt-status.c:1823
+#: wt-status.c:1828
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para seguir)\n"
-#: wt-status.c:1827 wt-status.c:1833
+#: wt-status.c:1832 wt-status.c:1838
#, c-format
msgid "nothing to commit\n"
msgstr "nada a commit\n"
-#: wt-status.c:1830
+#: wt-status.c:1835
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "nada a commit (use -u para mostrar ficheiros por seguir)\n"
-#: wt-status.c:1835
+#: wt-status.c:1840
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada a commitar, worktree limpa\n"
-#: wt-status.c:1940
+#: wt-status.c:1945
#, fuzzy
msgid "No commits yet on "
msgstr "Nenhum comando concluído."
-#: wt-status.c:1944
+#: wt-status.c:1949
msgid "HEAD (no branch)"
msgstr "HEAD (ramo nenhum)"
-#: wt-status.c:1975
+#: wt-status.c:1980
msgid "different"
msgstr "diferente"
-#: wt-status.c:1977 wt-status.c:1985
+#: wt-status.c:1982 wt-status.c:1990
msgid "behind "
msgstr "atrás "
-#: wt-status.c:1980 wt-status.c:1983
+#: wt-status.c:1985 wt-status.c:1988
msgid "ahead "
msgstr "à frente "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2505
+#: wt-status.c:2511
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "incapaz efetuar %s: Tens alterações despreparadas."
-#: wt-status.c:2511
+#: wt-status.c:2517
msgid "additionally, your index contains uncommitted changes."
msgstr "além disso, teu index contém alterações por memorizar."
-#: wt-status.c:2513
+#: wt-status.c:2519
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "incapaz efetuar %s: teu index contém alterações por memorizar."
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#: compat/simple-ipc/ipc-unix-socket.c:178
+#, fuzzy
+msgid "could not send IPC command"
+msgstr "incapaz encontrar commit %s"
+
+#: compat/simple-ipc/ipc-unix-socket.c:185
+#, fuzzy
+msgid "could not read IPC response"
+msgstr "incapaz de ler ref %s"
+
+#: compat/simple-ipc/ipc-unix-socket.c:862
+#, fuzzy, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "incapaz obter estatutário de ficheiro '%s'"
+
+#: compat/simple-ipc/ipc-unix-socket.c:874
+#, fuzzy, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "incapaz analisar log para '%s'"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
#, c-format
msgid "failed to unlink '%s'"
msgstr "falha ao unlink '%s'"
@@ -9794,127 +10250,133 @@ msgstr "falha ao unlink '%s'"
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opções>] [--] <caminho>..."
-#: builtin/add.c:88
+#: builtin/add.c:61
+#, fuzzy, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "incapaz chdir para '%s'"
+
+#: builtin/add.c:99
#, c-format
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:93 builtin/commit.c:285
+#: builtin/add.c:104 builtin/commit.c:297
msgid "updating files failed"
msgstr "falha ao atualizar os ficheiros"
-#: builtin/add.c:103
+#: builtin/add.c:114
#, c-format
msgid "remove '%s'\n"
msgstr "remove '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:198
msgid "Unstaged changes after refreshing the index:"
msgstr "Alterações despreparadas após refrescar index:"
-#: builtin/add.c:272 builtin/rev-parse.c:908
+#: builtin/add.c:307 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "Incapaz ler o index"
-#: builtin/add.c:283
+#: builtin/add.c:318
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Incapaz de abrir '%s' para escrita."
-#: builtin/add.c:287
+#: builtin/add.c:322
msgid "Could not write patch"
msgstr "Incapaz de escrever patch"
-#: builtin/add.c:290
+#: builtin/add.c:325
msgid "editing patch failed"
msgstr "edição de patch falhou"
-#: builtin/add.c:293
+#: builtin/add.c:328
#, c-format
msgid "Could not stat '%s'"
msgstr "Impossível fazer stat de '%s'"
-#: builtin/add.c:295
+#: builtin/add.c:330
msgid "Empty patch. Aborted."
msgstr "Patch vazio. Abortado."
-#: builtin/add.c:300
+#: builtin/add.c:335
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossível submeter '%s'"
-#: builtin/add.c:308
+#: builtin/add.c:343
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
-#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124
+#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
msgid "dry run"
msgstr "simular ação"
-#: builtin/add.c:331
+#: builtin/add.c:366
msgid "interactive picking"
msgstr "seleção interativa"
-#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
+#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "selecionar blocos interativamente"
-#: builtin/add.c:333
+#: builtin/add.c:368
msgid "edit current diff and apply"
msgstr "editar o diff atual e aplicá-lo"
-#: builtin/add.c:334
+#: builtin/add.c:369
msgid "allow adding otherwise ignored files"
msgstr "permitir adicionar ficheiros ignorados"
-#: builtin/add.c:335
+#: builtin/add.c:370
msgid "update tracked files"
msgstr "atualizar ficheiros controlados"
-#: builtin/add.c:336
+#: builtin/add.c:371
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:337
+#: builtin/add.c:372
msgid "record only the fact that the path will be added later"
msgstr "registar apenas o facto de que o caminho será adicionado mais tarde"
-#: builtin/add.c:338
+#: builtin/add.c:373
msgid "add changes from all tracked and untracked files"
-msgstr "adicionar alterações de todos ficheiros seguidos e ficheiros por seguir"
+msgstr ""
+"adicionar alterações de todos ficheiros seguidos e ficheiros por seguir"
-#: builtin/add.c:341
+#: builtin/add.c:376
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorar paths removidos na worktree (o mesmo que --no-all)"
-#: builtin/add.c:343
+#: builtin/add.c:378
msgid "don't add, only refresh the index"
msgstr "deixa de adicionar, apenas atualiza o index"
-#: builtin/add.c:344
+#: builtin/add.c:379
msgid "just skip files which cannot be added because of errors"
msgstr "apenas ignora ficheiros que, por causa de erros, ficam por adicionar"
-#: builtin/add.c:345
+#: builtin/add.c:380
msgid "check if - even missing - files are ignored in dry run"
msgstr "verificar quais os ficheiros ignorados na simulação"
-#: builtin/add.c:347 builtin/update-index.c:1004
+#: builtin/add.c:382 builtin/update-index.c:1006
msgid "override the executable bit of the listed files"
msgstr "substituir o bit executável dos ficheiros listados"
-#: builtin/add.c:349
+#: builtin/add.c:384
#, fuzzy
msgid "warn when adding an embedded repository"
msgstr "criar um repositório nu"
-#: builtin/add.c:351
+#: builtin/add.c:386
msgid "backend for `git stash -p`"
msgstr ""
-#: builtin/add.c:369
+#: builtin/add.c:404
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9932,170 +10394,175 @@ msgid ""
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:397
+#: builtin/add.c:432
#, fuzzy, c-format
msgid "adding embedded git repository: %s"
msgstr "--stdin requer um repositório git"
-#: builtin/add.c:416
+#: builtin/add.c:451
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""
msgstr ""
-#: builtin/add.c:425
+#: builtin/add.c:460
msgid "adding files failed"
msgstr "falha ao adicionar ficheiros"
-#: builtin/add.c:453 builtin/commit.c:345
+#: builtin/add.c:488
+#, fuzzy
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr "--first-parent é incompatível com --bisect"
+
+#: builtin/add.c:490 builtin/commit.c:357
#, fuzzy
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--first-parent é incompatível com --bisect"
-#: builtin/add.c:470
+#: builtin/add.c:507
#, fuzzy
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--first-parent é incompatível com --bisect"
-#: builtin/add.c:482
+#: builtin/add.c:519
msgid "-A and -u are mutually incompatible"
msgstr "-A e -u são mutuamente incompatíveis"
-#: builtin/add.c:485
+#: builtin/add.c:522
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
-#: builtin/add.c:489
+#: builtin/add.c:526
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
-#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
+#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
+#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
#, fuzzy
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--patch é incompatível com --{hard,mixed,soft}"
-#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
+#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
+#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
-#: builtin/add.c:518
+#: builtin/add.c:555
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ".\n"
-#: builtin/add.c:520
+#: builtin/add.c:557
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""
msgstr ""
-#: builtin/am.c:352
+#: builtin/am.c:364
msgid "could not parse author script"
msgstr "incapaz processar script de autor"
-#: builtin/am.c:436
+#: builtin/am.c:454
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' foi eliminado pelo hook applypatch-msg"
-#: builtin/am.c:478
+#: builtin/am.c:496
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Linha de entrada malformada: '%s'."
-#: builtin/am.c:516
+#: builtin/am.c:534
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falha ao copiar notas de '%s' para '%s'"
-#: builtin/am.c:542
+#: builtin/am.c:560
msgid "fseek failed"
msgstr "falha de fseek"
-#: builtin/am.c:730
+#: builtin/am.c:748
#, c-format
msgid "could not parse patch '%s'"
msgstr "incapaz processar patch '%s'"
-#: builtin/am.c:795
+#: builtin/am.c:813
msgid "Only one StGIT patch series can be applied at once"
msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
-#: builtin/am.c:843
+#: builtin/am.c:861
msgid "invalid timestamp"
msgstr "carimbo de data/hora inválido"
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:866 builtin/am.c:878
msgid "invalid Date line"
msgstr "linha de Data inválida"
-#: builtin/am.c:855
+#: builtin/am.c:873
msgid "invalid timezone offset"
msgstr "mudança de fuso horário inválida"
-#: builtin/am.c:948
+#: builtin/am.c:966
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:953 builtin/clone.c:410
+#: builtin/am.c:971 builtin/clone.c:414
#, c-format
msgid "failed to create directory '%s'"
msgstr "falha ao criar o diretório '%s'"
-#: builtin/am.c:958
+#: builtin/am.c:976
msgid "Failed to split patches."
msgstr "Falha ao dividir patches."
-#: builtin/am.c:1089
+#: builtin/am.c:1125
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Após resolver este problema, execute \"%s --continue\"."
-#: builtin/am.c:1090
+#: builtin/am.c:1126
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
-#: builtin/am.c:1091
+#: builtin/am.c:1127
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Para restaurar o ramo original e interromper a aplicação dos patches, "
"execute \"%s --abort\"."
-#: builtin/am.c:1174
+#: builtin/am.c:1222
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1202
+#: builtin/am.c:1250
#, fuzzy
msgid "Patch is empty."
msgstr "O patch atual está vazio."
-#: builtin/am.c:1267
+#: builtin/am.c:1315
#, fuzzy, c-format
msgid "missing author line in commit %s"
msgstr "Autor em falta: %s"
-#: builtin/am.c:1270
+#: builtin/am.c:1318
#, fuzzy, c-format
msgid "invalid ident line: %.*s"
msgstr "linha de identidade inválida: %s"
-#: builtin/am.c:1489
+#: builtin/am.c:1537
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Repositório falta blobs necessários para recorrer à tri-junção."
-#: builtin/am.c:1491
+#: builtin/am.c:1539
msgid "Using index info to reconstruct a base tree..."
msgstr "A usar informação do índice para reconstruir uma árvore de base..."
-#: builtin/am.c:1510
+#: builtin/am.c:1558
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10103,26 +10570,26 @@ msgstr ""
"Editaste o patch manualmente?\n"
"No registo de index, aplica-se a blobs nenhuns."
-#: builtin/am.c:1516
+#: builtin/am.c:1564
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"A recorrer a uma de base para aplicação de patches e integração com 3 "
"pontos..."
-#: builtin/am.c:1542
+#: builtin/am.c:1590
msgid "Failed to merge in the changes."
msgstr "Falha ao integrar as alterações."
-#: builtin/am.c:1574
+#: builtin/am.c:1622
msgid "applying to an empty history"
msgstr "a aplicar a um histórico vazio"
-#: builtin/am.c:1626 builtin/am.c:1630
+#: builtin/am.c:1674 builtin/am.c:1678
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "incapaz continuar: %s é inexistente."
-#: builtin/am.c:1648
+#: builtin/am.c:1696
msgid "Commit Body is:"
msgstr "Corpo do commit:"
@@ -10130,39 +10597,39 @@ msgstr "Corpo do commit:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1658
+#: builtin/am.c:1706
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
-#: builtin/am.c:1704 builtin/commit.c:395
+#: builtin/am.c:1752 builtin/commit.c:408
msgid "unable to write index file"
msgstr "incapaz escrever ficheiro de index"
-#: builtin/am.c:1708
+#: builtin/am.c:1756
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sujo: incapaz aplicar patches (sujo: %s)"
-#: builtin/am.c:1748 builtin/am.c:1816
+#: builtin/am.c:1796 builtin/am.c:1864
#, c-format
msgid "Applying: %.*s"
msgstr "A aplicar: %.*s"
-#: builtin/am.c:1765
+#: builtin/am.c:1813
msgid "No changes -- Patch already applied."
msgstr "Nenhuma alteração -- Já foi aplicado o patch."
-#: builtin/am.c:1771
+#: builtin/am.c:1819
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Falha ao aplicar o patch em %s %.*s"
-#: builtin/am.c:1775
+#: builtin/am.c:1823
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1819
+#: builtin/am.c:1867
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10172,7 +10639,7 @@ msgstr ""
"Se há mais nada por preparar, provavelmente essas mesmas alterações\n"
"já foram introduzidas; poderás querer saltar este patch."
-#: builtin/am.c:1826
+#: builtin/am.c:1874
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10180,17 +10647,17 @@ msgid ""
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Incapaz analisar objeto '%s'."
-#: builtin/am.c:1985
+#: builtin/am.c:2033
msgid "failed to clean index"
msgstr "falha ao limpar o índice"
-#: builtin/am.c:2029
+#: builtin/am.c:2077
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10198,158 +10665,165 @@ msgstr ""
"Parece que moveste HEAD desde a última falha de 'am'.\n"
"Recusando rebobinar até ORIG_HEAD"
-#: builtin/am.c:2136
+#: builtin/am.c:2184
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2178
+#: builtin/am.c:2226
#, fuzzy, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2182
+#: builtin/am.c:2230
#, fuzzy, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--first-parent é incompatível com --bisect"
-#: builtin/am.c:2213
+#: builtin/am.c:2261
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2262
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2268
msgid "run interactively"
msgstr "executar interativamente"
-#: builtin/am.c:2222
+#: builtin/am.c:2270
msgid "historical option -- no-op"
msgstr "opção histórica -- sem-ação"
-#: builtin/am.c:2224
+#: builtin/am.c:2272
msgid "allow fall back on 3way merging if needed"
msgstr "permitir recorrer a integração com 3 pontos se necessário"
-#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16
-#: builtin/repack.c:335 builtin/stash.c:815
+#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
+#: builtin/repack.c:472 builtin/stash.c:948
msgid "be quiet"
msgstr "silencioso"
-#: builtin/am.c:2227
+#: builtin/am.c:2275
#, fuzzy
msgid "add a Signed-off-by trailer to the commit message"
msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
-#: builtin/am.c:2230
+#: builtin/am.c:2278
msgid "recode into utf8 (default)"
msgstr "recodificar em utf8 (predefinição)"
-#: builtin/am.c:2232
+#: builtin/am.c:2280
msgid "pass -k flag to git-mailinfo"
msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2282
msgid "pass -b flag to git-mailinfo"
msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2284
msgid "pass -m flag to git-mailinfo"
msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2286
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2289
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"proibido passares --keep-cr para git-mailsplit independentemente de am.keepcr"
+"proibido passares --keep-cr para git-mailsplit independentemente de am."
+"keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2292
msgid "strip everything before a scissors line"
msgstr "retirar todo o conteúdo antes da linha de tesoura"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2294
+#, fuzzy
+msgid "pass it through git-mailinfo"
+msgstr "transmitir ao git-apply"
+
+#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306
+#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318
+#: builtin/am.c:2324
msgid "pass it through git-apply"
msgstr "transmitir ao git-apply"
-#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
+#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
-#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
+#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: parse-options.h:317
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
+#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
#: builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2270
+#: builtin/am.c:2321
msgid "format the patch(es) are in"
msgstr "formato de apresentação de patches"
-#: builtin/am.c:2276
+#: builtin/am.c:2327
msgid "override error message when patch failure occurs"
msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
-#: builtin/am.c:2278
+#: builtin/am.c:2329
msgid "continue applying patches after resolving a conflict"
msgstr "continuar a aplicar os patches depois de resolver os conflitos"
-#: builtin/am.c:2281
+#: builtin/am.c:2332
msgid "synonyms for --continue"
msgstr "sinónimo de --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2335
msgid "skip the current patch"
msgstr "ignorar o patch atual"
-#: builtin/am.c:2287
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2338
+#, fuzzy
+msgid "restore the original branch and abort the patching operation"
msgstr "restaurar o ramo original e abortar a operação de patch."
-#: builtin/am.c:2290
-msgid "abort the patching operation but keep HEAD where it is."
+#: builtin/am.c:2341
+msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2294
+#: builtin/am.c:2345
#, fuzzy
msgid "show the patch being applied"
msgstr "mostrar linhas sendo submetidas"
-#: builtin/am.c:2299
+#: builtin/am.c:2350
msgid "lie about committer date"
msgstr "mentir sobre a data de commit"
-#: builtin/am.c:2301
+#: builtin/am.c:2352
msgid "use current timestamp for author date"
msgstr "usar a data e hora atual como data de autor"
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
-#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
+#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
+#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
msgid "key-id"
msgstr "id-chave"
-#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
+#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
msgid "GPG-sign commits"
msgstr "assinar os commits com GPG"
-#: builtin/am.c:2307
+#: builtin/am.c:2358
msgid "(internal use for git-rebase)"
msgstr "(uso interno de git-rebase)"
-#: builtin/am.c:2325
+#: builtin/am.c:2376
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -10357,17 +10831,17 @@ msgstr ""
"A opção -b/--binary há muito que é ignorada e será removida.\n"
"Por favor deixa de usá-la."
-#: builtin/am.c:2332
+#: builtin/am.c:2383
msgid "failed to read the index"
msgstr "falha ao ler o índice"
-#: builtin/am.c:2347
+#: builtin/am.c:2398
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
-#: builtin/am.c:2371
+#: builtin/am.c:2422
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10376,11 +10850,11 @@ msgstr ""
"Diretório abandonado %s encontrado.\n"
"Use \"git am --abort\" para o remover."
-#: builtin/am.c:2377
+#: builtin/am.c:2428
msgid "Resolve operation not in progress, we are not resuming."
msgstr "A operação de resolução está parada, continuará parada."
-#: builtin/am.c:2387
+#: builtin/am.c:2438
msgid "interactive mode requires patches on the command line"
msgstr ""
@@ -10425,22 +10899,10 @@ msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --next-all [--no-checkout]"
#: builtin/bisect--helper.c:24
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:26
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:25
#, fuzzy
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10449,101 +10911,106 @@ msgstr ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
"[<paths>...]"
msgstr ""
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:28
#, fuzzy
msgid "git bisect--helper --bisect-next"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:31
+#: builtin/bisect--helper.c:29
#, fuzzy
-msgid "git bisect--helper --bisect-auto-next"
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:32
+#: builtin/bisect--helper.c:30
#, fuzzy
-msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:33
+#: builtin/bisect--helper.c:31
#, fuzzy
-msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgid "git bisect--helper --bisect-replay <filename>"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:108
+#: builtin/bisect--helper.c:32
+#, fuzzy
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:107
#, fuzzy, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "incapaz abrir ficheiro '%s' em modo '%s'"
-#: builtin/bisect--helper.c:115
+#: builtin/bisect--helper.c:114
#, fuzzy, c-format
msgid "could not write to file '%s'"
msgstr "incapaz escrever para ficheiro '%s'"
-#: builtin/bisect--helper.c:154
+#: builtin/bisect--helper.c:153
#, fuzzy, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' é um termo inválido."
-#: builtin/bisect--helper.c:158
+#: builtin/bisect--helper.c:157
#, fuzzy, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "incapaz usar comando embutido '%s' como um termo"
-#: builtin/bisect--helper.c:168
+#: builtin/bisect--helper.c:167
#, fuzzy, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "incapaz alterar o significado do termo '%s'"
-#: builtin/bisect--helper.c:178
+#: builtin/bisect--helper.c:177
msgid "please use two different terms"
msgstr "por favor, usa dois termos diferentes"
-#: builtin/bisect--helper.c:194
+#: builtin/bisect--helper.c:193
#, fuzzy, c-format
msgid "We are not bisecting.\n"
msgstr "Estamos bissetando nada.\n"
-#: builtin/bisect--helper.c:202
+#: builtin/bisect--helper.c:201
#, fuzzy, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' é um commit inválido"
-#: builtin/bisect--helper.c:211
+#: builtin/bisect--helper.c:210
#, fuzzy, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'."
-#: builtin/bisect--helper.c:255
+#: builtin/bisect--helper.c:254
#, fuzzy, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Argumento de bisect_write incorreto: $state"
-#: builtin/bisect--helper.c:260
+#: builtin/bisect--helper.c:259
#, fuzzy, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "incapaz obter oid da rev '%s'"
-#: builtin/bisect--helper.c:272
+#: builtin/bisect--helper.c:271
#, fuzzy, c-format
msgid "couldn't open the file '%s'"
msgstr "incapaz abrir o ficheiro '%s'"
-#: builtin/bisect--helper.c:298
+#: builtin/bisect--helper.c:297
#, fuzzy, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
-#: builtin/bisect--helper.c:325
+#: builtin/bisect--helper.c:324
#, fuzzy, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10552,7 +11019,7 @@ msgstr ""
"Deve indicar pelo menos uma revisão $bad_syn e uma revisão $good_syn.\n"
"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:328
#, fuzzy, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10563,7 +11030,7 @@ msgstr ""
"Indique pelo menos uma revisão $good_syn e uma revisão $bad_syn.\n"
"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
-#: builtin/bisect--helper.c:349
+#: builtin/bisect--helper.c:348
#, fuzzy, c-format
msgid "bisecting only with a %s commit"
msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
@@ -10572,22 +11039,22 @@ msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:357
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Tem a certeza [Y/n]? "
-#: builtin/bisect--helper.c:418
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "termo nenhum definido"
-#: builtin/bisect--helper.c:421
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
-#: builtin/bisect--helper.c:431
+#: builtin/bisect--helper.c:430
#, fuzzy, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10596,57 +11063,57 @@ msgstr ""
"argumento inválido %s para 'git bisect terms'.\n"
"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
-#: builtin/bisect--helper.c:498
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
#, fuzzy
msgid "revision walk setup failed\n"
msgstr "falha ao configurar percurso de revisões\n"
-#: builtin/bisect--helper.c:520
+#: builtin/bisect--helper.c:519
#, fuzzy, c-format
msgid "could not open '%s' for appending"
msgstr "incapaz abrir '%s' para acrescentar"
-#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
#, fuzzy
msgid "'' is not a valid term"
msgstr "'' é um termo inválido"
-#: builtin/bisect--helper.c:662
+#: builtin/bisect--helper.c:661
#, fuzzy, c-format
msgid "unrecognized option: '%s'"
msgstr "opção desconhecida: '%s'"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:665
#, fuzzy, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' parece ser uma revisão inválida"
-#: builtin/bisect--helper.c:697
+#: builtin/bisect--helper.c:696
#, fuzzy
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorreta - é necessário uma HEAD"
-#: builtin/bisect--helper.c:712
+#: builtin/bisect--helper.c:711
#, fuzzy, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
-#: builtin/bisect--helper.c:733
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "incapaz bissetar numa árvore \"cg-seek'ada\""
-#: builtin/bisect--helper.c:736
+#: builtin/bisect--helper.c:735
#, fuzzy
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorreta - referência simbólica desconhecida"
-#: builtin/bisect--helper.c:756
+#: builtin/bisect--helper.c:755
#, fuzzy, c-format
msgid "invalid ref: '%s'"
msgstr "ficheiro inválido: '%s'"
-#: builtin/bisect--helper.c:814
+#: builtin/bisect--helper.c:813
#, fuzzy
msgid "You need to start by \"git bisect start\"\n"
msgstr "Deve começar por executar \"git bisect start\"\n"
@@ -10655,99 +11122,116 @@ msgstr "Deve começar por executar \"git bisect start\"\n"
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:825
+#: builtin/bisect--helper.c:824
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Quer que o Git o faça por si [Y/n]? "
-#: builtin/bisect--helper.c:843
+#: builtin/bisect--helper.c:842
#, fuzzy
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Invoque 'bisect_state' com pelo menos um argumento."
-#: builtin/bisect--helper.c:856
+#: builtin/bisect--helper.c:855
#, fuzzy, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "'git bisect $TERM_BAD' só leva um argumento."
-#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
#, fuzzy, c-format
msgid "Bad rev input: %s"
msgstr "Revisão incorreta na entrada: $arg"
-#: builtin/bisect--helper.c:924
+#: builtin/bisect--helper.c:887
+#, fuzzy, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Revisão incorreta na entrada: $arg"
+
+#: builtin/bisect--helper.c:919
+msgid "We are not bisecting."
+msgstr "Estamos bissetando nada."
+
+#: builtin/bisect--helper.c:969
+#, fuzzy, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "?? de que é que estás a falar?"
+
+#: builtin/bisect--helper.c:981
+#, fuzzy, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "incapaz ler $file para reproduzir"
+
+#: builtin/bisect--helper.c:1054
#, fuzzy
msgid "reset the bisection state"
msgstr "remover uma secção: nome"
-#: builtin/bisect--helper.c:926
-msgid "write out the bisection state in BISECT_LOG"
-msgstr ""
-
-#: builtin/bisect--helper.c:928
-msgid "check and set terms in a bisection state"
-msgstr ""
-
-#: builtin/bisect--helper.c:930
+#: builtin/bisect--helper.c:1056
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:932
+#: builtin/bisect--helper.c:1058
#, fuzzy
msgid "print out the bisect terms"
msgstr "imprimir apenas as tags do objeto"
-#: builtin/bisect--helper.c:934
+#: builtin/bisect--helper.c:1060
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:936
+#: builtin/bisect--helper.c:1062
#, fuzzy
msgid "find the next bisection commit"
msgstr "encontra próximo commit de bisecção"
-#: builtin/bisect--helper.c:938
-msgid "verify the next bisection state then checkout the next bisection commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:940
+#: builtin/bisect--helper.c:1064
msgid "mark the state of ref (or refs)"
msgstr ""
-#: builtin/bisect--helper.c:942
-msgid "no log for BISECT_WRITE"
-msgstr ""
+#: builtin/bisect--helper.c:1066
+#, fuzzy
+msgid "list the bisection steps so far"
+msgstr "remover uma secção: nome"
-#: builtin/bisect--helper.c:957
-msgid "--bisect-reset requires either no argument or a commit"
+#: builtin/bisect--helper.c:1068
+msgid "replay the bisection process from the given file"
msgstr ""
-#: builtin/bisect--helper.c:961
+#: builtin/bisect--helper.c:1070
#, fuzzy
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr ":strip= requer um inteiro positivo como argumento"
+msgid "skip some commits for checkout"
+msgstr "'%s' tem commit checked out nenhum"
+
+#: builtin/bisect--helper.c:1072
+msgid "no log for BISECT_WRITE"
+msgstr ""
-#: builtin/bisect--helper.c:967
-msgid "--check-and-set-terms requires 3 arguments"
+#: builtin/bisect--helper.c:1087
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:973
+#: builtin/bisect--helper.c:1092
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:979
+#: builtin/bisect--helper.c:1098
#, fuzzy
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ":strip= requer um inteiro positivo como argumento"
-#: builtin/bisect--helper.c:988
+#: builtin/bisect--helper.c:1107
#, fuzzy
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next requer 0 argumentos"
-#: builtin/bisect--helper.c:994
+#: builtin/bisect--helper.c:1118
#, fuzzy
-msgid "--bisect-auto-next requires 0 arguments"
-msgstr "--bisect-auto-next requer 0 argumentos"
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/bisect--helper.c:1123
+#, fuzzy
+msgid "no logfile given"
+msgstr "Nenhum ficheiro de log fornecido"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
@@ -10766,146 +11250,168 @@ msgstr "a redirecionar para %s "
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:730
+#: builtin/blame.c:728
#, fuzzy, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ignorar cor inválida '%.*s' em log.graphColors"
-#: builtin/blame.c:748
+#: builtin/blame.c:746
#, fuzzy
msgid "invalid value for blame.coloring"
msgstr "valor inválido de %s"
-#: builtin/blame.c:847
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr ""
-#: builtin/blame.c:869
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+#, fuzzy
+msgid "show blame entries as we find them, incrementally"
msgstr ""
"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
-#: builtin/blame.c:870
+#: builtin/blame.c:868
#, fuzzy
-msgid "Do not show object names of boundary commits (Default: off)"
+msgid "do not show object names of boundary commits (Default: off)"
msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
-#: builtin/blame.c:871
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:869
+#, fuzzy
+msgid "do not treat root commits as boundaries (Default: off)"
msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"
-#: builtin/blame.c:872
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+#, fuzzy
+msgid "show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:873
-msgid "Force progress reporting"
-msgstr "Forçar informação de progresso"
+#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
+#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "forçar informação de progresso"
-#: builtin/blame.c:874
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+#, fuzzy
+msgid "show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
-#: builtin/blame.c:875
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+#, fuzzy
+msgid "show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
-#: builtin/blame.c:876
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+#, fuzzy
+msgid "show original linenumber (Default: off)"
msgstr "Mostrar números de linha originais (Predefinição: desativado)"
-#: builtin/blame.c:877
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+#, fuzzy
+msgid "show in a format designed for machine consumption"
msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
-#: builtin/blame.c:878
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+#, fuzzy
+msgid "show porcelain format with per-line commit information"
msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-#: builtin/blame.c:879
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+#, fuzzy
+msgid "use the same output mode as git-annotate (Default: off)"
msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-#: builtin/blame.c:880
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+#, fuzzy
+msgid "show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-#: builtin/blame.c:881
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+#, fuzzy
+msgid "show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-#: builtin/blame.c:882
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+#, fuzzy
+msgid "suppress author name and timestamp (Default: off)"
msgstr ""
"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
-#: builtin/blame.c:883
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+#, fuzzy
+msgid "show author email instead of name (Default: off)"
msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
-#: builtin/blame.c:884
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+#, fuzzy
+msgid "ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:885 builtin/log.c:1813
+#: builtin/blame.c:883 builtin/log.c:1820
#, fuzzy
msgid "rev"
msgstr "reverter"
-#: builtin/blame.c:885
+#: builtin/blame.c:883
#, fuzzy
-msgid "Ignore <rev> when blaming"
+msgid "ignore <rev> when blaming"
msgstr "ignorar o índice ao verificar"
-#: builtin/blame.c:886
+#: builtin/blame.c:884
#, fuzzy
-msgid "Ignore revisions from <file>"
+msgid "ignore revisions from <file>"
msgstr "ler mensagem de um ficheiro"
-#: builtin/blame.c:887
+#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:888
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:889
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+#, fuzzy
+msgid "spend extra cycles to find better match"
msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
-#: builtin/blame.c:890
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+#, fuzzy
+msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
-#: builtin/blame.c:891
-msgid "Use <file>'s contents as the final image"
+#: builtin/blame.c:889
+#, fuzzy
+msgid "use <file>'s contents as the final image"
msgstr "Usar o conteúdo do <ficheiro> como imagem final"
-#: builtin/blame.c:892 builtin/blame.c:893
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:892
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+#, fuzzy
+msgid "find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:893
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+#, fuzzy
+msgid "find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:894
+#: builtin/blame.c:892
#, fuzzy
msgid "range"
msgstr "intervalo"
-#: builtin/blame.c:895
+#: builtin/blame.c:893
#, fuzzy
-msgid "Process only line range <start>,<end> or function :<funcname>"
+msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
-#: builtin/blame.c:947
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"estás proibido de usar --progress com --incremental ou formatos porcelain"
@@ -10918,18 +11424,18 @@ msgstr ""
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:998
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "há 4 anos e 11 meses atrás"
-#: builtin/blame.c:1114
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "o ficheiro %s só tem %lu linha"
msgstr[1] "o ficheiro %s só tem %lu linhas"
-#: builtin/blame.c:1159
+#: builtin/blame.c:1157
msgid "Blaming lines"
msgstr "Linhas de culpa"
@@ -10999,124 +11505,114 @@ msgstr ""
msgid "Update of config-file failed"
msgstr "Falha ao atualizar o ficheiro de configuração"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "incapaz usar -a com -d"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "Incapaz de pesquisar objeto commit para HEAD"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossível apagar ramo '%s' checked out em '%s'"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "ramo de monitorização remoto '%s' por encontrar."
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr "ramo '%s' por encontrar."
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erro a eliminar o ramo de monitorização remoto '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Erro a eliminar ramo '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ramo %s eliminado (era %s).\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
#, fuzzy
msgid "unable to parse format string"
msgstr "incapaz processar o formato string"
-#: builtin/branch.c:460
+#: builtin/branch.c:471
#, fuzzy
msgid "could not resolve HEAD"
msgstr "incapaz resolver HEAD"
-#: builtin/branch.c:466
+#: builtin/branch.c:477
#, fuzzy, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) aponta para fora de refs/heads/"
-#: builtin/branch.c:481
+#: builtin/branch.c:492
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "O ramo %s está a ser rebaseado em %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:496
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "O ramo %s está a ser bissetado em %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:513
#, fuzzy
msgid "cannot copy the current branch while not on any."
msgstr "apenas podes copiar o ramo corrente enquanto estás num."
-#: builtin/branch.c:504
+#: builtin/branch.c:515
msgid "cannot rename the current branch while not on any."
msgstr "apenas podes renomear o ramo corrente enquanto estás num."
-#: builtin/branch.c:515
+#: builtin/branch.c:526
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:555
msgid "Branch rename failed"
msgstr "Falha ao mudar o nome do ramo"
-#: builtin/branch.c:544
+#: builtin/branch.c:557
#, fuzzy
msgid "Branch copy failed"
msgstr "Falha ao mudar o nome do ramo"
-#: builtin/branch.c:548
+#: builtin/branch.c:561
#, fuzzy, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "O ramo incorretamente denominado '%s' mudou de nome"
-#: builtin/branch.c:551
+#: builtin/branch.c:564
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "O ramo incorretamente denominado '%s' mudou de nome"
-#: builtin/branch.c:557
+#: builtin/branch.c:570
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ramo renomeado para %s, mas HEAD está desatualizada!"
-#: builtin/branch.c:566
+#: builtin/branch.c:579
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:568
+#: builtin/branch.c:581
#, fuzzy
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:584
+#: builtin/branch.c:597
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11127,219 +11623,221 @@ msgstr ""
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:631
msgid "Generic options"
msgstr "Opções genéricas"
-#: builtin/branch.c:620
+#: builtin/branch.c:633
msgid "show hash and subject, give twice for upstream branch"
msgstr "apresentar hash e assunto, duplique para ramos a montante"
-#: builtin/branch.c:621
+#: builtin/branch.c:634
msgid "suppress informational messages"
msgstr "suprimir mensagens informativas"
-#: builtin/branch.c:622
+#: builtin/branch.c:635
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurar modo de seguimento (consulte git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:637
#, fuzzy
msgid "do not use"
msgstr "esquema a usar"
-#: builtin/branch.c:626 builtin/rebase.c:532
+#: builtin/branch.c:639 builtin/rebase.c:533
msgid "upstream"
msgstr "a montante"
-#: builtin/branch.c:626
+#: builtin/branch.c:639
msgid "change the upstream info"
msgstr "alterar a informação do ramo a montante"
-#: builtin/branch.c:627
+#: builtin/branch.c:640
#, fuzzy
msgid "unset the upstream info"
msgstr "Remover a informação do ramo a montante"
-#: builtin/branch.c:628
+#: builtin/branch.c:641
msgid "use colored output"
msgstr "usar saída colorida"
-#: builtin/branch.c:629
+#: builtin/branch.c:642
msgid "act on remote-tracking branches"
msgstr "atuar sobre ramos de monitorização remotos"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:644 builtin/branch.c:646
msgid "print only branches that contain the commit"
msgstr "imprimir apenas ramos que contenham o commit"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:645 builtin/branch.c:647
msgid "print only branches that don't contain the commit"
msgstr "imprimir apenas ramos que contenham outro commit"
-#: builtin/branch.c:637
+#: builtin/branch.c:650
msgid "Specific git-branch actions:"
msgstr "Ações específicas do git-branch:"
-#: builtin/branch.c:638
+#: builtin/branch.c:651
msgid "list both remote-tracking and local branches"
msgstr "listar ramos de monitorização remotos e ramos locais"
-#: builtin/branch.c:640
+#: builtin/branch.c:653
msgid "delete fully merged branch"
msgstr "eliminar um ramo totalmente integrado"
-#: builtin/branch.c:641
+#: builtin/branch.c:654
msgid "delete branch (even if not merged)"
msgstr "elimina ramo (mesmo que esteja por juntar)"
-#: builtin/branch.c:642
+#: builtin/branch.c:655
msgid "move/rename a branch and its reflog"
msgstr "mover ou mudar o nome de um ramo e o seu reflog"
-#: builtin/branch.c:643
+#: builtin/branch.c:656
msgid "move/rename a branch, even if target exists"
msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
-#: builtin/branch.c:644
+#: builtin/branch.c:657
#, fuzzy
msgid "copy a branch and its reflog"
msgstr "mover ou mudar o nome de um ramo e o seu reflog"
-#: builtin/branch.c:645
+#: builtin/branch.c:658
#, fuzzy
msgid "copy a branch, even if target exists"
msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
-#: builtin/branch.c:646
+#: builtin/branch.c:659
msgid "list branch names"
msgstr "listar os nomes dos ramos"
-#: builtin/branch.c:647
+#: builtin/branch.c:660
#, fuzzy
msgid "show current branch name"
msgstr "Nenhum ramo atual."
-#: builtin/branch.c:648
+#: builtin/branch.c:661
msgid "create the branch's reflog"
msgstr "criar reflog do ramo"
-#: builtin/branch.c:650
+#: builtin/branch.c:663
msgid "edit the description for the branch"
msgstr "editar a descrição do ramo"
-#: builtin/branch.c:651
+#: builtin/branch.c:664
msgid "force creation, move/rename, deletion"
msgstr "forçar criação, mover/mudar o nome ou exclusão"
-#: builtin/branch.c:652
+#: builtin/branch.c:665
msgid "print only branches that are merged"
msgstr "imprimir apenas os ramos que foram integrados"
-#: builtin/branch.c:653
+#: builtin/branch.c:666
msgid "print only branches that are not merged"
msgstr "imprimir apenas ramos que estão por juntar"
-#: builtin/branch.c:654
+#: builtin/branch.c:667
msgid "list branches in columns"
msgstr "listar os ramos em colunas"
-#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:434
+#: builtin/tag.c:477
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:657
+#: builtin/branch.c:670
msgid "print only branches of the object"
msgstr "imprimir apenas os ramos do objeto"
-#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
msgid "sorting and filtering are case insensitive"
msgstr "ordenar e filtrar são insensíveis a maiúsculas"
-#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
+#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato a usar na saída"
-#: builtin/branch.c:682 builtin/clone.c:790
+#: builtin/branch.c:695 builtin/clone.c:794
msgid "HEAD not found below refs/heads!"
msgstr "HEAD por encontrar em refs/heads!"
-#: builtin/branch.c:706
+#: builtin/branch.c:719
msgid "--column and --verbose are incompatible"
msgstr "--column e --verbose são incompatíveis"
-#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
msgid "branch name required"
msgstr "nome do ramo é obrigatório"
-#: builtin/branch.c:751
+#: builtin/branch.c:766
msgid "Cannot give description to detached HEAD"
msgstr "Impossível dar descrição a HEAD solta"
-#: builtin/branch.c:756
+#: builtin/branch.c:771
msgid "cannot edit description of more than one branch"
msgstr "incapaz editar descrição de mais do que um ramo"
-#: builtin/branch.c:763
+#: builtin/branch.c:778
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Ramo '%s' ainda tem commit nenhum."
-#: builtin/branch.c:766
+#: builtin/branch.c:781
#, c-format
msgid "No branch named '%s'."
msgstr "Ramo nenhum denominado '%s'."
-#: builtin/branch.c:781
+#: builtin/branch.c:796
#, fuzzy
msgid "too many branches for a copy operation"
msgstr "demasiados ramos para uma operação de mudança de nome"
-#: builtin/branch.c:790
+#: builtin/branch.c:805
#, fuzzy
msgid "too many arguments for a rename operation"
msgstr "demasiados ramos para uma operação de mudança de nome"
-#: builtin/branch.c:795
+#: builtin/branch.c:810
#, fuzzy
msgid "too many arguments to set new upstream"
msgstr "demasiados ramos para definir novo ramo a montante"
-#: builtin/branch.c:799
+#: builtin/branch.c:814
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-"apenas pode definir upstream de HEAD para %s quando aponta para qualquer ramo."
+"apenas pode definir upstream de HEAD para %s quando aponta para qualquer "
+"ramo."
-#: builtin/branch.c:802 builtin/branch.c:825
+#: builtin/branch.c:817 builtin/branch.c:840
#, c-format
msgid "no such branch '%s'"
msgstr "esse ramo '%s' é inexistente"
-#: builtin/branch.c:806
+#: builtin/branch.c:821
#, c-format
msgid "branch '%s' does not exist"
msgstr "ramo '%s' é inexistente"
-#: builtin/branch.c:819
+#: builtin/branch.c:834
#, fuzzy
msgid "too many arguments to unset upstream"
msgstr "demasiados ramos para remover a definição de ramo a montante"
-#: builtin/branch.c:823
+#: builtin/branch.c:838
msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "apenas posso desdefinir upstream de HEAD quando aponta para qualquer ramo."
+msgstr ""
+"apenas posso desdefinir upstream de HEAD quando aponta para qualquer ramo."
-#: builtin/branch.c:829
+#: builtin/branch.c:844
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ramo '%s' tem informação de upstream nenhuma"
-#: builtin/branch.c:839
+#: builtin/branch.c:854
#, fuzzy
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
@@ -11348,7 +11846,7 @@ msgstr ""
"As opções -a, e -r, em 'git branch' levam nome de branch nenhum.\n"
"Quiseste utilizar: -a|-r --list <pattern>? "
-#: builtin/branch.c:843
+#: builtin/branch.c:858
#, fuzzy
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
@@ -11402,39 +11900,39 @@ msgid ""
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: builtin/bugreport.c:135
+#: builtin/bugreport.c:136
msgid "specify a destination for the bugreport file"
msgstr ""
-#: builtin/bugreport.c:137
+#: builtin/bugreport.c:138
msgid "specify a strftime format suffix for the filename"
msgstr ""
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c:160
#, fuzzy, c-format
msgid "could not create leading directories for '%s'"
msgstr "incapaz criar pastas superiores para '%s'"
-#: builtin/bugreport.c:166
+#: builtin/bugreport.c:167
msgid "System Info"
msgstr ""
-#: builtin/bugreport.c:169
+#: builtin/bugreport.c:170
#, fuzzy
msgid "Enabled Hooks"
msgstr "Hooks Ativados"
-#: builtin/bugreport.c:176
+#: builtin/bugreport.c:177
#, fuzzy, c-format
msgid "couldn't create a new file at '%s'"
msgstr "incapaz criar novo ficheiro em '%s'"
-#: builtin/bugreport.c:179
+#: builtin/bugreport.c:180
#, fuzzy, c-format
msgid "unable to write to %s"
msgstr "incapaz escrever para %s"
-#: builtin/bugreport.c:189
+#: builtin/bugreport.c:190
#, c-format
msgid "Created new report at '%s'.\n"
msgstr ""
@@ -11457,19 +11955,19 @@ msgstr ""
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:67 builtin/pack-objects.c:3480
+#: builtin/bundle.c:67 builtin/pack-objects.c:3747
msgid "do not show progress meter"
msgstr "mostrar medidor de progresso nenhum"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3482
+#: builtin/bundle.c:69 builtin/pack-objects.c:3749
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3484
+#: builtin/bundle.c:71 builtin/pack-objects.c:3751
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/bundle.c:74 builtin/pack-objects.c:3487
+#: builtin/bundle.c:74 builtin/pack-objects.c:3754
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
@@ -11616,8 +12114,8 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
-#: builtin/worktree.c:561
+#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
+#: builtin/worktree.c:491
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -11629,27 +12127,27 @@ msgstr "mostrar caminhos de entrada sem correspondência"
msgid "ignore index when checking"
msgstr "ignorar o índice ao verificar"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:165
msgid "cannot specify pathnames with --stdin"
msgstr "incapaz especificar pathnames com --stdin"
-#: builtin/check-ignore.c:166
+#: builtin/check-ignore.c:168
msgid "-z only makes sense with --stdin"
msgstr "-z só faz sentido com --stdin"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:170
msgid "no path specified"
msgstr "path nenhum especificado"
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:174
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet só é válido com um único caminho"
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:176
msgid "cannot have both --quiet and --verbose"
msgstr "incapaz usar ambos --quiet e --verbose"
-#: builtin/check-ignore.c:177
+#: builtin/check-ignore.c:179
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching só é válido com --verbose"
@@ -11670,218 +12168,223 @@ msgstr "incapaz processar contato: %s"
msgid "no contacts specified"
msgstr "contato nenhum especificado"
-#: builtin/checkout-index.c:139
+#: builtin/checkout--worker.c:110
+#, fuzzy
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout [<opções>] <ramo>"
+
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
+#: builtin/column.c:31 builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+msgid "string"
+msgstr "cadeia"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "preceder <cadeia> ao criar ficheiros"
+
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/checkout-index.c:156
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "stage deve ser um número entre 1 e 3 ou o parâmetro all"
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:187
msgid "check out all files in the index"
msgstr "extrair todos os ficheiros presentes no índice"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:188
msgid "force overwrite of existing files"
msgstr "forçar substituição dos ficheiros existentes"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:190
msgid "no warning for existing files and files not in index"
msgstr ""
-"mostrar aviso nenhum para ficheiros existentes e ficheiros fora do index"
+"mostrar aviso nenhum para ficheiros existentes e ficheiros fora do index"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:192
msgid "don't checkout new files"
msgstr "extrair ficheiros novos nenhuns"
-#: builtin/checkout-index.c:180
+#: builtin/checkout-index.c:194
msgid "update stat information in the index file"
msgstr "atualizar informação de stat no ficheiro de índice"
-#: builtin/checkout-index.c:184
+#: builtin/checkout-index.c:198
msgid "read list of paths from the standard input"
msgstr "ler lista de caminhos da entrada padrão"
-#: builtin/checkout-index.c:186
+#: builtin/checkout-index.c:200
msgid "write the content to temporary files"
msgstr "escrever o conteúdo em ficheiros temporários"
-#: builtin/checkout-index.c:187 builtin/column.c:31
-#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
-#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:757
-msgid "string"
-msgstr "cadeia"
-
-#: builtin/checkout-index.c:188
-msgid "when creating files, prepend <string>"
-msgstr "preceder <cadeia> ao criar ficheiros"
-
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:204
msgid "copy out the files from named stage"
msgstr "copiar os ficheiros do estágio indicado"
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opções>] <ramo>"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
#, fuzzy
msgid "git switch [<options>] [<branch>]"
msgstr "git checkout [<opções>] <ramo>"
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
#, fuzzy
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
-#: builtin/checkout.c:188 builtin/checkout.c:227
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have our version"
msgstr "path '%s' é diferente da nossa versão"
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:192 builtin/checkout.c:231
#, c-format
msgid "path '%s' does not have their version"
msgstr "path '%s' é diferente da versão deles"
-#: builtin/checkout.c:206
+#: builtin/checkout.c:208
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "path '%s' falta todas as versões necessárias"
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "path '%s' falta as versões necessárias"
-#: builtin/checkout.c:275
+#: builtin/checkout.c:278
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s': incapaz juntar"
-#: builtin/checkout.c:291
+#: builtin/checkout.c:294
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossível adicionar o resultado da junção para '%s'"
-#: builtin/checkout.c:396
+#: builtin/checkout.c:414
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:401
+#: builtin/checkout.c:419
#, fuzzy, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d caminho atualizado"
msgstr[1] "%d caminhos atualizados"
-#: builtin/checkout.c:408
+#: builtin/checkout.c:426
#, fuzzy, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "falha ao ler o índice"
msgstr[1] "falha ao ler o índice"
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
+#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' incapaz ser usado com paths em atualização"
-#: builtin/checkout.c:444 builtin/checkout.c:447
+#: builtin/checkout.c:462 builtin/checkout.c:465
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' incapaz ser usado com %s"
-#: builtin/checkout.c:451
+#: builtin/checkout.c:469
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Incapaz atualizar paths e mudar para ramo '%s' ao mesmo tempo."
-#: builtin/checkout.c:455
+#: builtin/checkout.c:473
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:459
+#: builtin/checkout.c:477
#, fuzzy, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"
-#: builtin/checkout.c:464 builtin/checkout.c:469
+#: builtin/checkout.c:482 builtin/checkout.c:487
#, fuzzy, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' ou '%s' impossível ser usado com %s"
-#: builtin/checkout.c:541 builtin/checkout.c:548
+#: builtin/checkout.c:563 builtin/checkout.c:570
#, c-format
msgid "path '%s' is unmerged"
msgstr "path '%s' está por juntar"
-#: builtin/checkout.c:716
+#: builtin/checkout.c:739
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:770
+#: builtin/checkout.c:793
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:866
+#: builtin/checkout.c:886
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Incapaz fazer reflog para '%s': %s\n"
-#: builtin/checkout.c:908
+#: builtin/checkout.c:928
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "incapaz atualizar HEAD"
-#: builtin/checkout.c:916
+#: builtin/checkout.c:936
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:919
+#: builtin/checkout.c:939
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:923
+#: builtin/checkout.c:943
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Mudou para e repôs o ramo '%s'\n"
-#: builtin/checkout.c:925 builtin/checkout.c:1356
+#: builtin/checkout.c:945 builtin/checkout.c:1376
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Mudou para o novo ramo '%s'\n"
-#: builtin/checkout.c:927
+#: builtin/checkout.c:947
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:978
+#: builtin/checkout.c:998
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:984
+#: builtin/checkout.c:1004
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11894,17 +12397,17 @@ msgid_plural ""
"\n"
"%s\n"
msgstr[0] ""
-"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos "
-"teus ramos:\n"
+"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos teus "
+"ramos:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Aviso: estás deixando %d commits para trás, desconetado a qualquer "
-"dos teus ramos:\n"
+"Aviso: estás deixando %d commits para trás, desconetado a qualquer dos teus "
+"ramos:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1003
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11931,26 +12434,26 @@ msgstr[1] ""
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1058
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1062
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:1082 builtin/checkout.c:1351
+#: builtin/checkout.c:1102 builtin/checkout.c:1371
msgid "You are on a branch yet to be born"
msgstr "Está num ramo ainda por nascer"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1184
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1171
+#: builtin/checkout.c:1191
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -11962,224 +12465,217 @@ msgid ""
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1201
#, fuzzy, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "atuar sobre ramos de monitorização remotos"
-#: builtin/checkout.c:1247
+#: builtin/checkout.c:1267
#, fuzzy
msgid "only one reference expected"
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1284
#, c-format
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
+#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1323 builtin/checkout.c:1689
+#: builtin/checkout.c:1343 builtin/checkout.c:1709
#, c-format
msgid "reference is not a tree: %s"
msgstr "referência é árvore nenhuma: %s"
-#: builtin/checkout.c:1370
+#: builtin/checkout.c:1390
#, fuzzy, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "esperado um ramo, recebi tag '%s'"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1392
#, fuzzy, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
-#: builtin/checkout.c:1373 builtin/checkout.c:1381
+#: builtin/checkout.c:1393 builtin/checkout.c:1401
#, fuzzy, c-format
msgid "a branch is expected, got '%s'"
msgstr "O ramo %s está a ser bissetado em %s"
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1396
#, fuzzy, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "é suposto um branch, recebi um commit '%s'"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1412
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1416
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1400
+#: builtin/checkout.c:1420
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1404
+#: builtin/checkout.c:1424
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1408
+#: builtin/checkout.c:1428
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1432
#, fuzzy
msgid "you are switching branch while bisecting"
msgstr "Está a bissetar neste momento."
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1439
msgid "paths cannot be used with switching branches"
msgstr "incapaz mudar ramo com o uso de paths"
-#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
+#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "incapaz de mudar ramo com o uso de '%s'"
+msgstr "incapaz de mudar ramo com o uso de '%s'"
-#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
-#: builtin/checkout.c:1445 builtin/checkout.c:1450
+#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
+#: builtin/checkout.c:1465 builtin/checkout.c:1470
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' é incapaz de ser usado com '%s'"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1467
#, fuzzy, c-format
msgid "'%s' cannot take <start-point>"
-msgstr "'%s' incapaz receber <start-point>"
+msgstr "'%s' incapaz receber <start-point>"
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1475
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1482
#, fuzzy
msgid "missing branch or commit argument"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
-#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
-#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
-#: builtin/send-pack.c:198
-msgid "force progress reporting"
-msgstr "forçar informação de progresso"
-
-#: builtin/checkout.c:1505
+#: builtin/checkout.c:1525
msgid "perform a 3-way merge with the new branch"
msgstr "realizar uma integração com 3 pontos com o novo ramo"
-#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
+#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1507
+#: builtin/checkout.c:1527
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1519 builtin/worktree.c:558
+#: builtin/checkout.c:1539 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1540
msgid "set upstream info for new branch"
msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1542
msgid "force checkout (throw away local modifications)"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1524
+#: builtin/checkout.c:1544
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1524
+#: builtin/checkout.c:1544
msgid "new unparented branch"
msgstr "novo ramo sem pai"
-#: builtin/checkout.c:1526 builtin/merge.c:300
+#: builtin/checkout.c:1546 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1529
+#: builtin/checkout.c:1549
msgid "do not check if another worktree is holding the given ref"
msgstr "incapaz verificar se outra worktree contém referência dada"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1562
msgid "checkout our version for unmerged files"
msgstr "checkout a nossa versão dos ficheiros por juntar"
-#: builtin/checkout.c:1545
+#: builtin/checkout.c:1565
msgid "checkout their version for unmerged files"
msgstr "checkout a versão deles dos ficheiros por juntar"
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1569
msgid "do not limit pathspecs to sparse entries only"
msgstr "abrange especificadores de path além de entradas dispersas"
-#: builtin/checkout.c:1604
+#: builtin/checkout.c:1624
#, fuzzy, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1608
+#: builtin/checkout.c:1628
#, fuzzy
msgid "-p and --overlay are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1645
+#: builtin/checkout.c:1665
msgid "--track needs a branch name"
msgstr "--track requer um nome dum ramo"
-#: builtin/checkout.c:1650
+#: builtin/checkout.c:1670
#, fuzzy, c-format
msgid "missing branch name; try -%c"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1682
+#: builtin/checkout.c:1702
#, fuzzy, c-format
msgid "could not resolve %s"
msgstr "incapaz resolver %s"
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1705
+#: builtin/checkout.c:1725
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1709
+#: builtin/checkout.c:1729
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach recusa path '%s' como argumento"
+msgstr "git checkout: --detach recusa path '%s' como argumento"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1738
#, fuzzy
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--first-parent é incompatível com --bisect"
-#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
+#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
#, fuzzy
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--first-parent é incompatível com --bisect"
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1754
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12187,80 +12683,80 @@ msgstr ""
"git checkout: --ours/--theirs, --force e --merge são incompatíveis\n"
"durante a extração do índice."
-#: builtin/checkout.c:1739
+#: builtin/checkout.c:1759
#, fuzzy
msgid "you must specify path(s) to restore"
msgstr "Deve especificar um diretório."
-#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
-#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
-#: builtin/worktree.c:556
+#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
+#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: builtin/worktree.c:486
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1766
+#: builtin/checkout.c:1786
msgid "create and checkout a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1788
msgid "create/reset and checkout a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1769
+#: builtin/checkout.c:1789
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
-#: builtin/checkout.c:1771
+#: builtin/checkout.c:1791
#, fuzzy
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1792
#, fuzzy
msgid "use overlay mode (default)"
msgstr "eliminar referências soltas (predefinição)"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1837
#, fuzzy
msgid "create and switch to a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1839
#, fuzzy
msgid "create/reset and switch to a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1821
+#: builtin/checkout.c:1841
#, fuzzy
msgid "second guess 'git switch <no-such-branch>'"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1823
+#: builtin/checkout.c:1843
#, fuzzy
msgid "throw away local modifications"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1857
+#: builtin/checkout.c:1877
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1859
+#: builtin/checkout.c:1879
#, fuzzy
msgid "restore the index"
msgstr "falha ao ler o índice"
-#: builtin/checkout.c:1861
+#: builtin/checkout.c:1881
#, fuzzy
msgid "restore the working tree (default)"
msgstr "Mostrar o estado da árvores de trabalho"
-#: builtin/checkout.c:1863
+#: builtin/checkout.c:1883
#, fuzzy
msgid "ignore unmerged entries"
msgstr "ignora unmerged entries"
-#: builtin/checkout.c:1864
+#: builtin/checkout.c:1884
msgid "use overlay mode"
msgstr ""
@@ -12290,11 +12786,6 @@ msgstr "A ignorar o repositório %s\n"
msgid "Would skip repository %s\n"
msgstr "Ignoraria o repositório %s\n"
-#: builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "falha ao remover %s"
-
#: builtin/clean.c:38
#, fuzzy, c-format
msgid "could not lstat %s\n"
@@ -12405,8 +12896,8 @@ msgid "remove whole directories"
msgstr "remover diretórios inteiros"
#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
-#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "padrão"
@@ -12447,163 +12938,169 @@ msgstr "-x e -X incapazes de ser usados juntos"
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opções>] [--] <repo> [<dir>]"
-#: builtin/clone.c:94
+#: builtin/clone.c:96
+#, fuzzy
+msgid "don't clone shallow repository"
+msgstr "para clonar de um repositório local"
+
+#: builtin/clone.c:98
msgid "don't create a checkout"
msgstr "cria checkout nenhum"
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
msgid "create a bare repository"
msgstr "criar um repositório nu"
-#: builtin/clone.c:99
+#: builtin/clone.c:103
msgid "create a mirror repository (implies bare)"
msgstr "criar um repositório espelhado (implica repositório nu)"
-#: builtin/clone.c:101
+#: builtin/clone.c:105
msgid "to clone from a local repository"
msgstr "para clonar de um repositório local"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "don't use local hardlinks, always copy"
msgstr "usa hardlinks nenhuns, copia sempre"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "setup as shared repository"
msgstr "configurar como repositório partilhado"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos no clone"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "number of submodules cloned in parallel"
msgstr "número de submódulos clonados em paralelo"
-#: builtin/clone.c:112 builtin/init-db.c:550
+#: builtin/clone.c:116 builtin/init-db.c:538
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:113 builtin/init-db.c:551
+#: builtin/clone.c:117 builtin/init-db.c:539
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
+#: builtin/submodule--helper.c:2337
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1834
+#: builtin/submodule--helper.c:2339
msgid "use --reference only while cloning"
msgstr "usar --reference apenas para clonar"
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
+#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
msgid "name"
msgstr "nome"
-#: builtin/clone.c:121
+#: builtin/clone.c:125
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
-#: builtin/clone.c:123
+#: builtin/clone.c:127
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
#: builtin/pull.c:208
msgid "depth"
msgstr "profundidade"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "create a shallow clone of that depth"
msgstr "criar um clone raso com essa profundidade"
-#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
#: builtin/pull.c:211
msgid "time"
msgstr "hora"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "create a shallow clone since a specific time"
msgstr "criar um clone raso desde uma data específica"
-#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
+#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
msgid "revision"
msgstr "revisão"
-#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1844
+#: builtin/submodule--helper.c:2353
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
-#: builtin/clone.c:135
+#: builtin/clone.c:139
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:137
+#: builtin/clone.c:141
msgid "any cloned submodules will be shallow"
msgstr "qualquer submódulo clonado será raso"
-#: builtin/clone.c:138 builtin/init-db.c:559
+#: builtin/clone.c:142 builtin/init-db.c:547
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:139 builtin/init-db.c:560
+#: builtin/clone.c:143 builtin/init-db.c:548
msgid "separate git dir from working tree"
msgstr "separar o repositório git da árvore de trabalho"
-#: builtin/clone.c:140
+#: builtin/clone.c:144
msgid "key=value"
msgstr "chave=valor"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
-#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "específico do servidor"
-#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "opção para transmitir"
-#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
-#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
-#: builtin/clone.c:150
+#: builtin/clone.c:154
#, fuzzy
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "qualquer submódulo clonado será raso"
-#: builtin/clone.c:152
+#: builtin/clone.c:156
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
-#: builtin/clone.c:288
+#: builtin/clone.c:292
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12611,42 +13108,42 @@ msgstr ""
"Incapaz adivinhar nome de pasta.\n"
"Por favor especifique uma pasta na linha de comandos"
-#: builtin/clone.c:341
+#: builtin/clone.c:345
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Incapaz adicionar sobressalente para '%s': %s\n"
-#: builtin/clone.c:414
+#: builtin/clone.c:418
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe e é pasta nenhuma"
-#: builtin/clone.c:432
+#: builtin/clone.c:436
#, fuzzy, c-format
msgid "failed to start iterator over '%s'"
msgstr "falha ao escrever para '%s'"
-#: builtin/clone.c:463
+#: builtin/clone.c:467
#, c-format
msgid "failed to create link '%s'"
msgstr "falha ao criar a ligação '%s'"
-#: builtin/clone.c:467
+#: builtin/clone.c:471
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falha ao copiar o ficheiro para '%s'"
-#: builtin/clone.c:472
+#: builtin/clone.c:476
#, fuzzy, c-format
msgid "failed to iterate over '%s'"
msgstr "falha ao remover '%s'"
-#: builtin/clone.c:499
+#: builtin/clone.c:503
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
-#: builtin/clone.c:513
+#: builtin/clone.c:517
#, fuzzy
msgid ""
"Clone succeeded, but checkout failed.\n"
@@ -12657,148 +13154,148 @@ msgstr ""
"Pode inspecionar o que foi extraído com 'git status'\n"
"e repetir a extração com 'git checkout -f HEAD'\n"
-#: builtin/clone.c:590
+#: builtin/clone.c:594
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Incapaz encontrar ramo remoto %s para clonar."
-#: builtin/clone.c:709
+#: builtin/clone.c:713
#, c-format
msgid "unable to update %s"
msgstr "incapaz atualizar %s"
-#: builtin/clone.c:757
+#: builtin/clone.c:761
#, fuzzy
msgid "failed to initialize sparse-checkout"
msgstr "falha ao finalizar integração de notas"
-#: builtin/clone.c:780
+#: builtin/clone.c:784
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n"
-#: builtin/clone.c:812
+#: builtin/clone.c:816
msgid "unable to checkout working tree"
msgstr "incapaz de checkout working tree"
-#: builtin/clone.c:887
+#: builtin/clone.c:894
msgid "unable to write parameters to config file"
msgstr "incapaz escrever parâmetros para ficheiro config"
-#: builtin/clone.c:950
+#: builtin/clone.c:957
msgid "cannot repack to clean up"
msgstr "incapaz reempacotar para limpar"
-#: builtin/clone.c:952
+#: builtin/clone.c:959
msgid "cannot unlink temporary alternates file"
msgstr "incapaz unlink ficheiro sobressalente temporário"
-#: builtin/clone.c:992 builtin/receive-pack.c:2493
+#: builtin/clone.c:1001 builtin/receive-pack.c:2491
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:996
+#: builtin/clone.c:1005
msgid "You must specify a repository to clone."
msgstr "Deve especificar um repositório para clonar."
-#: builtin/clone.c:1009
+#: builtin/clone.c:1018
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "as opções --bare e --origin %s são incompatíveis."
-#: builtin/clone.c:1012
+#: builtin/clone.c:1021
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare e --separate-git-dir são incompatíveis."
-#: builtin/clone.c:1025
+#: builtin/clone.c:1035
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositório '%s' é inexistente"
-#: builtin/clone.c:1029 builtin/fetch.c:1841
+#: builtin/clone.c:1039 builtin/fetch.c:2011
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s é número positivo nenhum"
-#: builtin/clone.c:1039
+#: builtin/clone.c:1049
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "path de destino '%s' já existe e é pasta vazia nenhum."
-#: builtin/clone.c:1045
+#: builtin/clone.c:1055
#, fuzzy, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "path de repositório '%s' já existe e é diretório vazio nenhum."
-#: builtin/clone.c:1059
+#: builtin/clone.c:1069
#, c-format
msgid "working tree '%s' already exists."
msgstr "a árvore de trabalho '%s' já existe."
-#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
-#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
+#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
+#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "incapaz criar as pastas superiores de '%s'"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1089
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "incapaz criar pasta de work tree '%s'"
-#: builtin/clone.c:1099
+#: builtin/clone.c:1109
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando em repositório nú '%s'...\n"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1111
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando em '%s'...\n"
-#: builtin/clone.c:1125
+#: builtin/clone.c:1135
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive é incompatível com ambos --reference e --reference-if-able"
-#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' é nome de remoto inválido"
-#: builtin/clone.c:1210
+#: builtin/clone.c:1229
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1212
+#: builtin/clone.c:1231
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1214
+#: builtin/clone.c:1233
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1216
+#: builtin/clone.c:1235
#, fuzzy
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--depth é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:1219
+#: builtin/clone.c:1240
msgid "source repository is shallow, ignoring --local"
msgstr "o repositório de origem é raso, --local ignorado"
-#: builtin/clone.c:1224
+#: builtin/clone.c:1245
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:1308 builtin/clone.c:1316
+#: builtin/clone.c:1337 builtin/clone.c:1345
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Ramo remoto %s por encontrar em upstream %s"
-#: builtin/clone.c:1319
+#: builtin/clone.c:1348
msgid "You appear to have cloned an empty repository."
msgstr "Parece foi clonado um repositório vazio."
@@ -12815,19 +13312,23 @@ msgid "layout to use"
msgstr "esquema a usar"
#: builtin/column.c:30
-msgid "Maximum width"
+#, fuzzy
+msgid "maximum width"
msgstr "Largura máxima"
#: builtin/column.c:31
-msgid "Padding space on left border"
+#, fuzzy
+msgid "padding space on left border"
msgstr "Espaço de preenchimento na borda esquerda"
#: builtin/column.c:32
-msgid "Padding space on right border"
+#, fuzzy
+msgid "padding space on right border"
msgstr "Espaço de preenchimento na borda direita"
#: builtin/column.c:33
-msgid "Padding space between columns"
+#, fuzzy
+msgid "padding space between columns"
msgstr "Espaço de preenchimento entre colunas"
#: builtin/column.c:51
@@ -12852,13 +13353,13 @@ msgid "could not find object directory matching %s"
msgstr "incapaz encontrar pasta objeto correspondendo %s"
#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
msgid "dir"
msgstr "dir"
#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
#: builtin/commit-graph.c:317
-msgid "The object directory to store the graph"
+msgid "the object directory to store the graph"
msgstr ""
#: builtin/commit-graph.c:83
@@ -12945,7 +13446,7 @@ msgstr ""
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
#, fuzzy, c-format
msgid "not a valid object name %s"
msgstr "%s nome de objeto inválido"
@@ -12975,13 +13476,13 @@ msgstr "número-pai"
msgid "id of a parent commit object"
msgstr "falha ao escrever objeto de commit"
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
-#: builtin/tag.c:413
+#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
+#: builtin/tag.c:456
msgid "message"
msgstr "mensagem"
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
+#: builtin/commit-tree.c:115 builtin/commit.c:1614
msgid "commit message"
msgstr "mensagem de commit"
@@ -12990,7 +13491,7 @@ msgstr "mensagem de commit"
msgid "read commit log message from file"
msgstr "ler mensagem de um ficheiro"
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
+#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
@@ -13061,75 +13562,75 @@ msgid ""
"\n"
msgstr ""
-#: builtin/commit.c:312
+#: builtin/commit.c:324
msgid "failed to unpack HEAD tree object"
msgstr "falha ao descompactar o objeto árvore HEAD"
-#: builtin/commit.c:348
+#: builtin/commit.c:360
#, fuzzy
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspe de ficheiro com -a faz sentido nenhum."
-#: builtin/commit.c:361
+#: builtin/commit.c:374
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only fazem sentido nenhum sem indicar paths."
-#: builtin/commit.c:373
+#: builtin/commit.c:386
msgid "unable to create temporary index"
msgstr "incapaz criar index temporário"
-#: builtin/commit.c:382
+#: builtin/commit.c:395
msgid "interactive add failed"
msgstr "falha ao adicionar interativamente"
-#: builtin/commit.c:397
+#: builtin/commit.c:410
msgid "unable to update temporary index"
msgstr "incapaz atualizar index temporário"
-#: builtin/commit.c:399
+#: builtin/commit.c:412
msgid "Failed to update main cache tree"
msgstr "Falha ao atualizar a árvore de cache principal"
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
msgid "unable to write new_index file"
msgstr "incapaz escrever ficheiro new_index"
-#: builtin/commit.c:476
+#: builtin/commit.c:489
msgid "cannot do a partial commit during a merge."
msgstr "incapaz fazer commit parcial durante uma junção."
-#: builtin/commit.c:478
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a cherry-pick."
msgstr "incapaz fazer commit parcial durante um cherry-pick."
-#: builtin/commit.c:480
+#: builtin/commit.c:493
#, fuzzy
msgid "cannot do a partial commit during a rebase."
msgstr "incapaz fazer commit parcial durante um rebase."
-#: builtin/commit.c:488
+#: builtin/commit.c:501
msgid "cannot read the index"
msgstr "incapaz ler o index"
-#: builtin/commit.c:507
+#: builtin/commit.c:520
msgid "unable to write temporary index file"
msgstr "incapaz escrever ficheiro de index temporário"
-#: builtin/commit.c:605
+#: builtin/commit.c:618
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' falta cabeçalho de autor"
-#: builtin/commit.c:607
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "o commit '%s' tem a linha de autor malformada"
-#: builtin/commit.c:626
+#: builtin/commit.c:639
msgid "malformed --author parameter"
msgstr "parâmetro --author malformado"
-#: builtin/commit.c:679
+#: builtin/commit.c:692
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -13137,38 +13638,43 @@ msgstr ""
"incapaz selecionar um carácter de comentário fica por usar\n"
"na mensagem de commit atual"
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
#, c-format
msgid "could not lookup commit %s"
msgstr "incapaz consultar commit %s"
-#: builtin/commit.c:729 builtin/shortlog.c:425
+#: builtin/commit.c:758 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(a ler mensagem de log da entrada padrão)\n"
-#: builtin/commit.c:731
+#: builtin/commit.c:760
msgid "could not read log from standard input"
msgstr "incapaz ler log da entrada padrão"
-#: builtin/commit.c:735
+#: builtin/commit.c:764
#, c-format
msgid "could not read log file '%s'"
msgstr "incapaz ler ficheiro de log '%s'"
-#: builtin/commit.c:766 builtin/commit.c:782
+#: builtin/commit.c:801
+#, fuzzy, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "incapaz de combinar '--root' com '--fork-point'"
+
+#: builtin/commit.c:813 builtin/commit.c:829
msgid "could not read SQUASH_MSG"
msgstr "incapaz ler SQUASH_MSG"
-#: builtin/commit.c:773
+#: builtin/commit.c:820
msgid "could not read MERGE_MSG"
msgstr "incapaz ler MERGE_MSG"
-#: builtin/commit.c:833
+#: builtin/commit.c:880
msgid "could not write commit template"
msgstr "incapaz escrever o modelo de commit"
-#: builtin/commit.c:853
+#: builtin/commit.c:900
#, fuzzy
msgid ""
"\n"
@@ -13183,7 +13689,7 @@ msgstr ""
"\tgit update-ref -d MERGE_HEAD\n"
"e tenta de novo.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:905
#, fuzzy
msgid ""
"\n"
@@ -13198,7 +13704,7 @@ msgstr ""
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"e tenta de novo.\n"
-#: builtin/commit.c:868
+#: builtin/commit.c:915
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13208,7 +13714,7 @@ msgstr ""
"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
"aborta o commit.\n"
-#: builtin/commit.c:876
+#: builtin/commit.c:923
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -13219,148 +13725,180 @@ msgstr ""
"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
"Uma mensagem vazia aborta o commit.\n"
-#: builtin/commit.c:893
+#: builtin/commit.c:940
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:901
+#: builtin/commit.c:948
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:908
+#: builtin/commit.c:955
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:926
+#: builtin/commit.c:973
msgid "Cannot read index"
msgstr "Incapaz ler index"
-#: builtin/commit.c:997
+#: builtin/commit.c:1018
+#, fuzzy
+msgid "unable to pass trailers to --trailers"
+msgstr "incapaz processar cabeçalho de %s"
+
+#: builtin/commit.c:1058
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:1011 builtin/tag.c:276
+#: builtin/commit.c:1072 builtin/tag.c:319
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Indique a mensagem usando apenas as opções -m ou -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1116
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' é diferente 'Nome <email>' e corresponde a um autor inexistente"
+msgstr ""
+"--author '%s' é diferente 'Nome <email>' e corresponde a um autor inexistente"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1130
#, fuzzy, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo de ignorar inválido '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1331
+#: builtin/commit.c:1148 builtin/commit.c:1441
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de ficheiros por seguir '%s'"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1188
msgid "--long and -z are incompatible"
msgstr "--long e -z são incompatíveis"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1219
+#, fuzzy
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Estás no meio de junção -- incapaz emendar."
+
+#: builtin/commit.c:1221
+#, fuzzy
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Estás no meio de cherry-pick -- incapaz emendar."
+
+#: builtin/commit.c:1224
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr ""
+
+#: builtin/commit.c:1226
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+
+#: builtin/commit.c:1245
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author e --author faz sentido nenhum"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1254
msgid "You have nothing to amend."
msgstr "Tens nada para emendar."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1257
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás no meio de junção -- incapaz emendar."
-#: builtin/commit.c:1185
+#: builtin/commit.c:1259
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Estás no meio de cherry-pick -- incapaz emendar."
-#: builtin/commit.c:1187
+#: builtin/commit.c:1261
#, fuzzy
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Estás no meio de rebase -- incapaz emendar."
-#: builtin/commit.c:1190
+#: builtin/commit.c:1264
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opções --squash e --fixup incapaz serem usadas juntas"
-#: builtin/commit.c:1200
+#: builtin/commit.c:1274
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
-#: builtin/commit.c:1202
+#: builtin/commit.c:1276
#, fuzzy
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Opção -m incapaz ser combinada com -c/C/-F."
-#: builtin/commit.c:1211
+#: builtin/commit.c:1285
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
-#: builtin/commit.c:1229
+#: builtin/commit.c:1303
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
-#: builtin/commit.c:1235
+#: builtin/commit.c:1331
+#, fuzzy, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "desconheço opção: %s\n"
+
+#: builtin/commit.c:1345
#, fuzzy, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' com -a faz sentido nenhum"
-#: builtin/commit.c:1366 builtin/commit.c:1527
+#: builtin/commit.c:1476 builtin/commit.c:1642
msgid "show status concisely"
msgstr "mostrar status de forma concisa"
-#: builtin/commit.c:1368 builtin/commit.c:1529
+#: builtin/commit.c:1478 builtin/commit.c:1644
msgid "show branch information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1480
#, fuzzy
msgid "show stash information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1372 builtin/commit.c:1531
+#: builtin/commit.c:1482 builtin/commit.c:1646
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1374
+#: builtin/commit.c:1484
msgid "version"
msgstr "versão"
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:725
+#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
+#: builtin/worktree.c:681
msgid "machine-readable output"
msgstr "saída inteligível por máquina"
-#: builtin/commit.c:1377 builtin/commit.c:1535
+#: builtin/commit.c:1487 builtin/commit.c:1650
msgid "show status in long format (default)"
msgstr "apresentar status em formato longo (predefinição)"
-#: builtin/commit.c:1380 builtin/commit.c:1538
+#: builtin/commit.c:1490 builtin/commit.c:1653
msgid "terminate entries with NUL"
msgstr "terminar entradas com NUL"
-#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336
+#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1383 builtin/commit.c:1541
+#: builtin/commit.c:1493 builtin/commit.c:1656
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-"mostrar ficheiros por seguir, modo opcional: all, normal, no. "
-"(Predefinição: all)"
+"mostrar ficheiros por seguir, modo opcional: all, normal, no. (Predefinição: "
+"all)"
-#: builtin/commit.c:1387
+#: builtin/commit.c:1497
#, fuzzy
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
@@ -13369,11 +13907,11 @@ msgstr ""
"mostrar ficheiros ignorados, modo opcional: traditional, matching, no. "
"(Predefinição: tradicional)"
-#: builtin/commit.c:1389 parse-options.h:192
+#: builtin/commit.c:1499 parse-options.h:193
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1390
+#: builtin/commit.c:1500
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13381,173 +13919,196 @@ msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
-#: builtin/commit.c:1392
+#: builtin/commit.c:1502
msgid "list untracked files in columns"
msgstr "listar ficheiros por seguir em colunas"
-#: builtin/commit.c:1393
+#: builtin/commit.c:1503
#, fuzzy
msgid "do not detect renames"
msgstr "detecção renomeação nenhuma"
-#: builtin/commit.c:1395
+#: builtin/commit.c:1505
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1415
+#: builtin/commit.c:1525
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1497
+#: builtin/commit.c:1607
msgid "suppress summary after successful commit"
msgstr "suprimir o resumo depois de submeter com sucesso"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1608
msgid "show diff in commit message template"
msgstr "mostrar diff no modelo da mensagem de commit"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1610
msgid "Commit message options"
msgstr "Opções de mensagem de commit"
-#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
+#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
msgid "read message from file"
msgstr "ler mensagem de um ficheiro"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1612
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1612
msgid "override author for commit"
msgstr "substituir autor do commit"
-#: builtin/commit.c:1503 builtin/gc.c:542
+#: builtin/commit.c:1613 builtin/gc.c:550
msgid "date"
msgstr "data"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1613
msgid "override date for commit"
msgstr "substituir data do commit"
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
+#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
+#: parse-options.h:329 ref-filter.h:90
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1615
msgid "reuse and edit message from specified commit"
msgstr "reutilizar e editar a mensagem de um commit especificado"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1616
msgid "reuse message from specified commit"
msgstr "reutilizar a mensagem de um commit especificado"
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1621
+#, fuzzy
+msgid "[(amend|reword):]commit"
+msgstr "emendar o commit anterior"
+
+#: builtin/commit.c:1621
+#, fuzzy
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr ""
"usar mensagem com formato autosquash para corrigir o commit especificado"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1622
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar mensagem com formato autosquash para esmagar o commit especificado"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1623
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
-#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
+#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "terminador"
+
+#: builtin/commit.c:1624
+msgid "add custom trailer(s)"
+msgstr ""
+
+#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
#: builtin/pull.c:145 builtin/revert.c:110
#, fuzzy
msgid "add a Signed-off-by trailer"
msgstr "adicionar Signed-off-by:"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1626
msgid "use specified template file"
msgstr "usar ficheiro de modelo especificado"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1627
msgid "force edit of commit"
msgstr "forçar edição do commit"
-#: builtin/commit.c:1514
+#: builtin/commit.c:1629
msgid "include status in commit message template"
msgstr "incluir status no modelo da mensagem de commit"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1634
msgid "Commit contents options"
msgstr "Opções de conteúdo do commit"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1635
msgid "commit all changed files"
msgstr "submeter todos os ficheiros alterados"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1636
msgid "add specified files to index for commit"
msgstr "adicionar ficheiros especificados ao índice para submeter"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1637
msgid "interactively add files"
msgstr "adicionar ficheiros interativamente"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1638
msgid "interactively add changes"
msgstr "adicionar alterações interativamente"
-#: builtin/commit.c:1524
+#: builtin/commit.c:1639
msgid "commit only specified files"
msgstr "submeter somente os ficheiros especificados"
-#: builtin/commit.c:1525
+#: builtin/commit.c:1640
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ignorar pre-commit e commit-msg hooks"
-#: builtin/commit.c:1526
+#: builtin/commit.c:1641
msgid "show what would be committed"
msgstr "mostrar o que seria submetido"
-#: builtin/commit.c:1539
+#: builtin/commit.c:1654
msgid "amend previous commit"
msgstr "emendar o commit anterior"
-#: builtin/commit.c:1540
+#: builtin/commit.c:1655
msgid "bypass post-rewrite hook"
msgstr "ignorar post-rewrite hook"
-#: builtin/commit.c:1547
+#: builtin/commit.c:1662
msgid "ok to record an empty change"
msgstr "aceitar o registo duma alteração vazia"
-#: builtin/commit.c:1549
+#: builtin/commit.c:1664
msgid "ok to record a change with an empty message"
msgstr "aceitar o registo duma alteração com uma mensagem vazia"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1737
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD roto (%s)"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1744
msgid "could not read MERGE_MODE"
msgstr "incapaz ler MERGE_MODE"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1765
#, c-format
msgid "could not read commit message: %s"
msgstr "incapaz ler mensagem de commit: %s"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1772
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
-#: builtin/commit.c:1662
+#: builtin/commit.c:1777
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; mensagem ficou por editar.\n"
-#: builtin/commit.c:1696
+#: builtin/commit.c:1788
+#, fuzzy, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
+
+#: builtin/commit.c:1824
#, fuzzy
msgid ""
"repository has been updated, but unable to write\n"
@@ -13906,7 +14467,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
msgid "print sizes in human readable format"
msgstr "imprimir dimensões em formato inteligível por humanos"
-#: builtin/credential-cache--daemon.c:226
+#: builtin/credential-cache--daemon.c:227
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13920,11 +14481,11 @@ msgstr ""
"\n"
"\tchmod 0700 %s"
-#: builtin/credential-cache--daemon.c:275
+#: builtin/credential-cache--daemon.c:276
msgid "print debugging messages to stderr"
msgstr "imprimir mensagens de depuração no stderr"
-#: builtin/credential-cache--daemon.c:315
+#: builtin/credential-cache--daemon.c:316
msgid "credential-cache--daemon unavailable; no unix socket support"
msgstr ""
@@ -14114,70 +14675,70 @@ msgstr "-b, -B e --orphan são mutuamente exclusivos"
msgid "--merge-base only works with two commits"
msgstr ""
-#: builtin/diff.c:91
+#: builtin/diff.c:92
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s': é ficheiro normal nenhum e é ligação simbólica nenhuma"
-#: builtin/diff.c:258
+#: builtin/diff.c:259
#, c-format
msgid "invalid option: %s"
msgstr "opção inválida: %s"
-#: builtin/diff.c:375
+#: builtin/diff.c:376
#, c-format
msgid "%s...%s: no merge base"
msgstr ""
-#: builtin/diff.c:485
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "É repositório git nenhum"
-#: builtin/diff.c:530 builtin/grep.c:681
+#: builtin/diff.c:532 builtin/grep.c:684
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto inválido '%s' fornecido."
-#: builtin/diff.c:541
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mais do que dois blobs fornecidos: '%s'"
-#: builtin/diff.c:546
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto sem tratamento '%s' fornecido."
-#: builtin/diff.c:580
+#: builtin/diff.c:582
#, c-format
msgid "%s...%s: multiple merge bases, using %s"
msgstr ""
-#: builtin/difftool.c:30
+#: builtin/difftool.c:31
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opções>] [<commit> [<commit>]] [--] [<caminho>...]"
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
#, c-format
msgid "failed: %d"
msgstr "falha: %d"
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink %s"
msgstr "incapaz ler ligação simbólica %s"
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
#, c-format
msgid "could not read symlink file %s"
msgstr "incapaz ler ficheiro de ligação simbólica %s"
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "incapaz ler o objeto %s para ligação simbólica %s"
-#: builtin/difftool.c:412
+#: builtin/difftool.c:413
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -14185,55 +14746,55 @@ msgstr ""
"formatos diff combinado('-c' e '--cc') são insustentados em\n"
"modo diff pasta('-d' e '--dir-diff')."
-#: builtin/difftool.c:633
+#: builtin/difftool.c:637
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos os ficheiros modificados: '%s' e '%s'."
-#: builtin/difftool.c:635
+#: builtin/difftool.c:639
msgid "working tree file has been left."
msgstr "ficheiro de árvore de trabalho foi deixado."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:650
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existem ficheiros temporários em '%s'."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:651
msgid "you may want to cleanup or recover these."
msgstr "pode querer limpar ou recuperá-los."
-#: builtin/difftool.c:696
+#: builtin/difftool.c:700
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use 'diff.guitool' em vez de 'diff.tool'"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:702
msgid "perform a full-directory diff"
msgstr "efetuar diff diretório completo"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:704
msgid "do not prompt before launching a diff tool"
msgstr "deixar de perguntar antes de lançar ferramenta diff"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:709
msgid "use symlinks in dir-diff mode"
msgstr "usar symlinks no modi dir-diff"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:710
#, fuzzy
msgid "tool"
msgstr "ferramenta"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:711
msgid "use the specified diff tool"
msgstr "usar a ferramenta diff especificada"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:713
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'"
-#: builtin/difftool.c:712
+#: builtin/difftool.c:716
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -14241,33 +14802,33 @@ msgstr ""
"fazer com que 'git-difftool' termine quando uma ferramenta diff invocada "
"retorna um código de saída diferente de zero"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:719
msgid "specify a custom command for viewing diffs"
msgstr "especificar um comando personalizado para ver diffs"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:720
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:731
+#: builtin/difftool.c:735
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:738
+#: builtin/difftool.c:742
#, fuzzy
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dirty é incompatível com commits ou semelhantes"
-#: builtin/difftool.c:741
+#: builtin/difftool.c:745
#, fuzzy
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/difftool.c:749
+#: builtin/difftool.c:753
msgid "no <tool> given for --tool=<tool>"
msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>"
-#: builtin/difftool.c:756
+#: builtin/difftool.c:760
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "<cmd> nenhum dado a --extcmd=<cmd>"
@@ -14307,94 +14868,101 @@ msgstr "git fast-export [opções-de-rev-list]"
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1177
msgid "--anonymize-map token cannot be empty"
msgstr ""
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "mostrar progresso depois de <n> objetos"
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "selecionar o tratamento de tags assinadas"
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1205
#, fuzzy
msgid "select handling of commit messages in an alternate encoding"
msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
-#: builtin/fast-export.c:1209
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+#, fuzzy
+msgid "dump marks to this file"
msgstr "Capturar marcas neste ficheiro"
-#: builtin/fast-export.c:1211
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+#, fuzzy
+msgid "import marks from this file"
msgstr "Importar marcas deste ficheiro"
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1214
#, fuzzy
-msgid "Import marks from this file if it exists"
+msgid "import marks from this file if it exists"
msgstr "Importar marcas deste ficheiro"
-#: builtin/fast-export.c:1217
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1216
+#, fuzzy
+msgid "fake a tagger when tags lack one"
msgstr "Falsear um \"tageador\" para quando falte um às tags"
-#: builtin/fast-export.c:1219
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+#, fuzzy
+msgid "output full tree for each commit"
msgstr "Mostrar a árvore completa para cada commit"
-#: builtin/fast-export.c:1221
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+#, fuzzy
+msgid "use the done feature to terminate the stream"
msgstr "Usar a funcionalidade done para terminar o fluxo"
-#: builtin/fast-export.c:1222
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+#, fuzzy
+msgid "skip output of blob data"
msgstr "Ignorar a exibição de dados de blob"
-#: builtin/fast-export.c:1223 builtin/log.c:1816
+#: builtin/fast-export.c:1222 builtin/log.c:1823
msgid "refspec"
msgstr "especificador de referência"
-#: builtin/fast-export.c:1224
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+#, fuzzy
+msgid "apply refspec to exported refs"
msgstr "Aplicar o especificador de referência a referências exportadas"
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "anonimizar saída"
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1225
msgid "from:to"
msgstr ""
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1226
msgid "convert <from> to <to> in anonymized output"
msgstr ""
-#: builtin/fast-export.c:1230
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1232
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
msgstr ""
-#: builtin/fast-export.c:1234
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
msgstr ""
-#: builtin/fast-export.c:1257
+#: builtin/fast-export.c:1256
#, fuzzy
msgid "--anonymize-map without --anonymize does not make sense"
msgstr "--anonymize-map sem --anonymize faz sentido nenhum"
-#: builtin/fast-export.c:1272
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
@@ -14427,7 +14995,7 @@ msgstr ""
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
-#: builtin/fetch-pack.c:241
+#: builtin/fetch-pack.c:242
#, fuzzy, c-format
msgid "Lockfile created but not reported: %s"
msgstr "Ficheiro de bloqueio criado mas por reportar: %s"
@@ -14449,203 +15017,215 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opções>]"
-#: builtin/fetch.c:119
+#: builtin/fetch.c:122
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:142 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "obter de todos os remotos"
-#: builtin/fetch.c:144 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:245
#, fuzzy
msgid "set upstream for git pull/fetch"
msgstr "definir o ramo a montante usado com git pull/status"
-#: builtin/fetch.c:146 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
-#: builtin/fetch.c:148 builtin/pull.c:191
+#: builtin/fetch.c:151
+#, fuzzy
+msgid "use atomic transaction to update references"
+msgstr "solicitar transação atómica no servidor remoto"
+
+#: builtin/fetch.c:153 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "caminho para o comando upload pack no remoto"
-#: builtin/fetch.c:149
+#: builtin/fetch.c:154
#, fuzzy
msgid "force overwrite of local reference"
msgstr "forçar a substituição do ramo local"
-#: builtin/fetch.c:151
+#: builtin/fetch.c:156
msgid "fetch from multiple remotes"
msgstr "obter de múltiplos remotos"
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "obter todas as tags e objetos associados"
-#: builtin/fetch.c:155
+#: builtin/fetch.c:160
msgid "do not fetch all tags (--no-tags)"
msgstr "buscar tag nenhuma (--no-tags)"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:162
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos obtidos em paralelo"
-#: builtin/fetch.c:159 builtin/pull.c:198
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr ""
-"podar ramos de monitorização remotos que deixaram de estar no remoto"
-#: builtin/fetch.c:161
+#: builtin/fetch.c:166 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "podar ramos de monitorização remotos que deixaram de estar no remoto"
+
+#: builtin/fetch.c:168
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:163
+#: builtin/fetch.c:170
msgid "control recursive fetching of submodules"
msgstr "controlar a obtenção recursiva de submódulos"
-#: builtin/fetch.c:168
+#: builtin/fetch.c:175
#, fuzzy
msgid "write fetched references to the FETCH_HEAD file"
msgstr "escrever o arquivo para este ficheiro"
-#: builtin/fetch.c:169 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "manter o pacote transferido"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:178
msgid "allow updating of HEAD ref"
msgstr "permitir a atualização da referência HEAD"
-#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "aprofundar o histórico de um clone raso"
-#: builtin/fetch.c:176 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "aprofundar o histórico de repositório raso com base na data"
-#: builtin/fetch.c:182 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "converter num repositório completo"
-#: builtin/fetch.c:185
+#: builtin/fetch.c:192
msgid "prepend this to submodule path output"
msgstr "preceder isto ao caminho do submódulo"
-#: builtin/fetch.c:188
+#: builtin/fetch.c:195
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:192 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "aceitar referência que atualizem .git/shallow"
-#: builtin/fetch.c:193 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:226
msgid "refmap"
msgstr "mapa de referências"
-#: builtin/fetch.c:194 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "especificar mapa de referências"
-#: builtin/fetch.c:201 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:204 builtin/fetch.c:206
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
#, fuzzy
msgid "run 'maintenance --auto' after fetching"
msgstr "eliminar remotos depois de obter"
-#: builtin/fetch.c:208 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:210
+#: builtin/fetch.c:219
#, fuzzy
msgid "write the commit-graph after fetching"
msgstr "eliminar remotos depois de obter"
-#: builtin/fetch.c:212
+#: builtin/fetch.c:221
#, fuzzy
msgid "accept refspecs from stdin"
msgstr "ler referências do stdin"
-#: builtin/fetch.c:523
+#: builtin/fetch.c:586
msgid "Couldn't find remote ref HEAD"
msgstr "Incapaz de encontrar ref remota HEAD"
-#: builtin/fetch.c:677
+#: builtin/fetch.c:757
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "configuração fetch.output contém valor inválido %s"
-#: builtin/fetch.c:775
+#: builtin/fetch.c:856
#, c-format
msgid "object %s not found"
msgstr "objeto %s por encontrar"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:860
msgid "[up to date]"
msgstr "[atualizado]"
-#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
msgid "[rejected]"
msgstr "[rejeitado]"
-#: builtin/fetch.c:793
+#: builtin/fetch.c:874
msgid "can't fetch in current branch"
msgstr "incapaz buscar no ramo atual"
-#: builtin/fetch.c:803
+#: builtin/fetch.c:884
msgid "[tag update]"
msgstr "[tag atualizada]"
-#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
-#: builtin/fetch.c:875
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
msgid "unable to update local ref"
msgstr "incapaz atualizar ref local"
-#: builtin/fetch.c:808
+#: builtin/fetch.c:889
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:830
+#: builtin/fetch.c:911
msgid "[new tag]"
msgstr "[nova tag]"
-#: builtin/fetch.c:833
+#: builtin/fetch.c:914
msgid "[new branch]"
msgstr "[novo ramo]"
-#: builtin/fetch.c:836
+#: builtin/fetch.c:917
msgid "[new ref]"
msgstr "[nova referência]"
-#: builtin/fetch.c:875
+#: builtin/fetch.c:956
msgid "forced update"
msgstr "atualização forçada"
-#: builtin/fetch.c:880
+#: builtin/fetch.c:961
msgid "non-fast-forward"
msgstr "sem avanço-rápido"
-#: builtin/fetch.c:901
+#: builtin/fetch.c:1065
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-#: builtin/fetch.c:905
+#: builtin/fetch.c:1069
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14654,22 +15234,22 @@ msgid ""
" to avoid this check.\n"
msgstr ""
-#: builtin/fetch.c:939
+#: builtin/fetch.c:1101
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s ficou por enviar todos objetos necessários\n"
-#: builtin/fetch.c:960
+#: builtin/fetch.c:1129
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s rejeitado, porque as raízes rasas são proibidas de ser atualizadas"
-#: builtin/fetch.c:1053 builtin/fetch.c:1191
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:1064
+#: builtin/fetch.c:1228
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14678,80 +15258,80 @@ msgstr ""
"algumas refs locais ficaram desatualizadas; tenta executar\n"
" 'git remote prune %s' para remover algum ramo antigo e conflituoso"
-#: builtin/fetch.c:1161
+#: builtin/fetch.c:1327
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s ficará suspenso)"
-#: builtin/fetch.c:1162
+#: builtin/fetch.c:1328
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s ficou suspenso)"
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1360
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1195 builtin/remote.c:1118
+#: builtin/fetch.c:1361 builtin/remote.c:1118
msgid "(none)"
msgstr "(nenhum)"
-#: builtin/fetch.c:1218
+#: builtin/fetch.c:1384
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Recusando buscar para o ramo atual %s de repositório diferente de nu"
-#: builtin/fetch.c:1237
+#: builtin/fetch.c:1403
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Opção \"%s\" com valor \"%s\" é inválido para %s"
-#: builtin/fetch.c:1240
+#: builtin/fetch.c:1406
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opção \"%s\" ignorada em %s\n"
-#: builtin/fetch.c:1448
+#: builtin/fetch.c:1618
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
-#: builtin/fetch.c:1463
+#: builtin/fetch.c:1633
#, fuzzy
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"
-#: builtin/fetch.c:1465
+#: builtin/fetch.c:1635
#, fuzzy
msgid "not setting upstream for a remote tag"
msgstr "definir o ramo a montante usado com git pull/status"
-#: builtin/fetch.c:1467
+#: builtin/fetch.c:1637
#, fuzzy
msgid "unknown branch type"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/fetch.c:1469
+#: builtin/fetch.c:1639
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
-#: builtin/fetch.c:1598 builtin/fetch.c:1661
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
#, c-format
msgid "Fetching %s\n"
msgstr "A obter de %s\n"
-#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Incapaz buscar %s"
-#: builtin/fetch.c:1620
+#: builtin/fetch.c:1790
#, fuzzy, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "fetch '%s' impossível (exit code: %d)\n"
-#: builtin/fetch.c:1724
+#: builtin/fetch.c:1894
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14759,50 +15339,63 @@ msgstr ""
"Nenhum repositório remoto especificado. Especifique um URL ou\n"
"o nome remoto a partir do qual as novas revisões devem ser obtidas."
-#: builtin/fetch.c:1760
+#: builtin/fetch.c:1930
msgid "You need to specify a tag name."
msgstr "Deve especificar um nome para a tag."
-#: builtin/fetch.c:1825
+#: builtin/fetch.c:1995
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidade negativa em --deepen tem suporte nenhum"
-#: builtin/fetch.c:1827
+#: builtin/fetch.c:1997
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/fetch.c:1832
+#: builtin/fetch.c:2002
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow incapazes serem usados juntos"
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:2004
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow num repositório completo faz sentido nenhum"
-#: builtin/fetch.c:1851
+#: builtin/fetch.c:2021
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all leva como argumento repositório nenhum"
-#: builtin/fetch.c:1853
+#: builtin/fetch.c:2023
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all com refspecs, faz sentido nenhum"
-#: builtin/fetch.c:1862
+#: builtin/fetch.c:2032
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Remoto ou grupo remoto inexistente: %s"
-#: builtin/fetch.c:1869
+#: builtin/fetch.c:2039
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Buscar um grupo e especificar refspecs faz sentido nenhum"
-#: builtin/fetch.c:1887
+#: builtin/fetch.c:2055
+msgid "must supply remote when using --negotiate-only"
+msgstr ""
+
+#: builtin/fetch.c:2060
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr ""
+
+#: builtin/fetch.c:2079
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fetch.c:1891
+#: builtin/fetch.c:2083
+#, fuzzy
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "A opção --exec só pode ser usada em conjunto com --remote"
+
+#: builtin/fetch.c:2087
#, fuzzy
msgid "--stdin can only be used when fetching from one remote"
msgstr "A opção --exec só pode ser usada em conjunto com --remote"
@@ -14851,51 +15444,51 @@ msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for shells"
msgstr ""
"envolver os marcadores de posição em aspas de forma adequada para "
"interpretadores de comandos"
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for perl"
msgstr "envolver os marcadores de posição em aspas de forma adequada para perl"
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for python"
msgstr ""
"envolver os marcadores de posição em aspas de forma adequada para python"
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
msgid "quote placeholders suitably for Tcl"
msgstr "envolver os marcadores de posição em aspas de forma adequada para Tcl"
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
msgid "show only <n> matched refs"
msgstr "mostrar apenas <n> referências correspondidas"
-#: builtin/for-each-ref.c:39 builtin/tag.c:440
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
#, fuzzy
msgid "respect format colors"
msgstr "formato esperado: %%(color:<cor>)"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
msgid "print only refs which points at the given object"
msgstr "imprimir apenas referências que apontem para o objeto fornecido"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
msgid "print only refs that are merged"
msgstr "imprimir apenas referenciadas integradas"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
msgid "print only refs that are not merged"
msgstr "imprimir apenas refs que estão por juntar"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
msgid "print only refs which contain the commit"
msgstr "imprimir apenas refs que contenham o commit"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
msgid "print only refs which don't contain the commit"
msgstr "imprimir apenas refs que contenham outros commits"
@@ -14915,249 +15508,249 @@ msgstr ""
msgid "missing --config=<config>"
msgstr ""
-#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
+#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
#, fuzzy
msgid "unknown"
msgstr "desconhecido"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:101 builtin/fsck.c:121
+#: builtin/fsck.c:78 builtin/fsck.c:100
#, fuzzy, c-format
msgid "error in %s %s: %s"
msgstr "erro em %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:115
+#: builtin/fsck.c:94
#, fuzzy, c-format
msgid "warning in %s %s: %s"
msgstr "aviso em %s %s: %s"
-#: builtin/fsck.c:144 builtin/fsck.c:147
+#: builtin/fsck.c:123 builtin/fsck.c:126
#, c-format
msgid "broken link from %7s %s"
msgstr ""
-#: builtin/fsck.c:156
+#: builtin/fsck.c:135
#, fuzzy
msgid "wrong object type in link"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/fsck.c:172
+#: builtin/fsck.c:151
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
-#: builtin/fsck.c:283
+#: builtin/fsck.c:263
#, fuzzy, c-format
msgid "missing %s %s"
msgstr "falta o objeto %s de %s"
-#: builtin/fsck.c:310
+#: builtin/fsck.c:290
#, fuzzy, c-format
msgid "unreachable %s %s"
msgstr "já se tem %s (%s)"
-#: builtin/fsck.c:330
+#: builtin/fsck.c:310
#, fuzzy, c-format
msgid "dangling %s %s"
msgstr "balanceando %s %s"
-#: builtin/fsck.c:340
+#: builtin/fsck.c:320
#, fuzzy
msgid "could not create lost-found"
-msgstr "incapaz criar lost-found"
+msgstr "incapaz criar lost-found"
-#: builtin/fsck.c:351
+#: builtin/fsck.c:331
#, fuzzy, c-format
msgid "could not finish '%s'"
msgstr "incapaz acabar '%s'"
-#: builtin/fsck.c:368
+#: builtin/fsck.c:348
#, fuzzy, c-format
msgid "Checking %s"
msgstr "A verificar objetos"
-#: builtin/fsck.c:406
+#: builtin/fsck.c:386
#, fuzzy, c-format
msgid "Checking connectivity (%d objects)"
msgstr "A verificar conectividade"
-#: builtin/fsck.c:425
+#: builtin/fsck.c:405
#, fuzzy, c-format
msgid "Checking %s %s"
msgstr "A verificar o patch %s..."
-#: builtin/fsck.c:430
+#: builtin/fsck.c:410
msgid "broken links"
msgstr ""
-#: builtin/fsck.c:439
+#: builtin/fsck.c:419
#, fuzzy, c-format
msgid "root %s"
msgstr "raiz"
-#: builtin/fsck.c:447
+#: builtin/fsck.c:427
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/fsck.c:476
+#: builtin/fsck.c:456
#, c-format
msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/fsck.c:501
+#: builtin/fsck.c:481
#, fuzzy, c-format
msgid "%s: invalid reflog entry %s"
msgstr "referência inválida: %s"
-#: builtin/fsck.c:515
+#: builtin/fsck.c:495
#, fuzzy, c-format
msgid "Checking reflog %s->%s"
msgstr "Verificando reflog %s->%s"
-#: builtin/fsck.c:549
+#: builtin/fsck.c:529
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "linha rasa inválida: %s"
-#: builtin/fsck.c:556
+#: builtin/fsck.c:536
#, fuzzy, c-format
msgid "%s: not a commit"
msgstr "%s: é commit nenhum"
-#: builtin/fsck.c:610
+#: builtin/fsck.c:590
#, fuzzy
msgid "notice: No default references"
msgstr "notificação: Referências padrão nenhumas"
-#: builtin/fsck.c:625
+#: builtin/fsck.c:605
#, fuzzy, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto roto ou em falta: %s"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:618
#, fuzzy, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objeto incapaz de ser processado: %s"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:638
#, fuzzy, c-format
msgid "bad sha1 file: %s"
msgstr "mau ficheiro sha1: %s"
-#: builtin/fsck.c:673
+#: builtin/fsck.c:653
#, fuzzy
msgid "Checking object directory"
msgstr "Verificando pasta objeto"
-#: builtin/fsck.c:676
+#: builtin/fsck.c:656
msgid "Checking object directories"
msgstr "Verificando pastas objeto"
-#: builtin/fsck.c:691
+#: builtin/fsck.c:671
#, fuzzy, c-format
msgid "Checking %s link"
msgstr "Verfificando ligação %s"
-#: builtin/fsck.c:696 builtin/index-pack.c:865
+#: builtin/fsck.c:676 builtin/index-pack.c:866
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:703
+#: builtin/fsck.c:683
#, fuzzy, c-format
msgid "%s points to something strange (%s)"
-msgstr "%s aponta para algo estranho (%s)"
+msgstr "%s aponta para algo estranho (%s)"
-#: builtin/fsck.c:709
+#: builtin/fsck.c:689
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:713
+#: builtin/fsck.c:693
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:725
+#: builtin/fsck.c:705
#, fuzzy
msgid "Checking cache tree"
msgstr "A verificar o patch %s..."
-#: builtin/fsck.c:730
+#: builtin/fsck.c:710
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "Falha ao atualizar a árvore de cache principal"
-#: builtin/fsck.c:739
+#: builtin/fsck.c:719
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:770
+#: builtin/fsck.c:750
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opções>] [<objeto>...]"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:756
msgid "show unreachable objects"
msgstr "mostrar objetos inalcançáveis"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:757
msgid "show dangling objects"
msgstr "mostrar objetos suspensos"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:758
msgid "report tags"
msgstr "mostrar tags"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:759
msgid "report root nodes"
msgstr "mostrar nós raiz"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:760
msgid "make index objects head nodes"
msgstr "considerar objetos do índice como nós cabeça"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:761
msgid "make reflogs head nodes (default)"
msgstr "considerar os reflogs como nós cabeça (predefinição)"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:762
msgid "also consider packs and alternate objects"
msgstr "considerar também pacotes e objetos sobressalente"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:763
msgid "check only connectivity"
msgstr "verificar só a conetividade"
-#: builtin/fsck.c:784
+#: builtin/fsck.c:764 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "ativar verificação mais rigorosa"
-#: builtin/fsck.c:786
+#: builtin/fsck.c:766
msgid "write dangling objects in .git/lost-found"
msgstr "escrever objetos suspensos em .git/lost-found"
-#: builtin/fsck.c:787 builtin/prune.c:134
+#: builtin/fsck.c:767 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progresso"
-#: builtin/fsck.c:788
+#: builtin/fsck.c:768
msgid "show verbose names for reachable objects"
msgstr "mostrar nomes verbosos de objetos inalcançáveis"
-#: builtin/fsck.c:847 builtin/index-pack.c:261
+#: builtin/fsck.c:827 builtin/index-pack.c:262
msgid "Checking objects"
msgstr "A verificar objetos"
-#: builtin/fsck.c:875
+#: builtin/fsck.c:855
#, fuzzy, c-format
msgid "%s: object missing"
msgstr "mostrar tamanho do objeto"
-#: builtin/fsck.c:886
+#: builtin/fsck.c:866
#, fuzzy, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
@@ -15166,27 +15759,27 @@ msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
msgid "git gc [<options>]"
msgstr "git gc [<opções>]"
-#: builtin/gc.c:94
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "falha ao invocar fstat sobre %s: %s"
-#: builtin/gc.c:130
+#: builtin/gc.c:129
#, fuzzy, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "falha ao abrir '%s': %s"
-#: builtin/gc.c:479 builtin/init-db.c:58
+#: builtin/gc.c:487 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "incapaz estatutar '%s'"
-#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
#, c-format
msgid "cannot read '%s'"
msgstr "incapaz ler '%s'"
-#: builtin/gc.c:495
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -15201,205 +15794,235 @@ msgstr ""
"\n"
"%s"
-#: builtin/gc.c:543
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "podar objetos por referênciar"
-#: builtin/gc.c:545
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "ser mais minucioso (aumenta o tempo de execução)"
-#: builtin/gc.c:546
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "ativar modo auto-gc"
-#: builtin/gc.c:549
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "forçar a execução do gc mesmo que haja outro gc a executar"
-#: builtin/gc.c:552
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:569
+#: builtin/gc.c:576
#, fuzzy, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "falha ao analisar o valor %s de gc.logexpiry"
-#: builtin/gc.c:580
+#: builtin/gc.c:587
#, fuzzy, c-format
msgid "failed to parse prune expiry value %s"
msgstr "falha ao analisar o valor %s de gc.logexpiry"
-#: builtin/gc.c:600
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Autocompactando o repositório para desempenho ótimizado, em segundo plano.\n"
-#: builtin/gc.c:602
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Autocompactando o repositório para desempenho ótimizado.\n"
-#: builtin/gc.c:603
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vê \"git help gc\" para manual de manutenção.\n"
-#: builtin/gc.c:643
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"gc já a executar na máquina '%s' pid %<PRIuMAX> (usa --force caso contrário)"
-#: builtin/gc.c:698
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Existem demasiados objeto soltos inalcançáveis; execute 'git prune' para os "
"remover."
-#: builtin/gc.c:708
+#: builtin/gc.c:715
msgid ""
"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
msgstr ""
-#: builtin/gc.c:738
+#: builtin/gc.c:745
msgid "--no-schedule is not allowed"
msgstr ""
-#: builtin/gc.c:743
+#: builtin/gc.c:750
#, fuzzy, c-format
msgid "unrecognized --schedule argument '%s'"
msgstr "argumento --schedule desconhecido: '%s'"
-#: builtin/gc.c:862
+#: builtin/gc.c:869
#, fuzzy
msgid "failed to write commit-graph"
msgstr "falha ao escrever objeto de commit"
-#: builtin/gc.c:901
+#: builtin/gc.c:905
#, fuzzy
-msgid "failed to fill remotes"
+msgid "failed to prefetch remotes"
msgstr "falha ao remover %s"
-#: builtin/gc.c:1024
+#: builtin/gc.c:1022
#, fuzzy
msgid "failed to start 'git pack-objects' process"
msgstr "começar processo 'git pack-objects' falhou"
-#: builtin/gc.c:1041
+#: builtin/gc.c:1039
#, fuzzy
msgid "failed to finish 'git pack-objects' process"
msgstr "terminar processo 'git pack-objects' falhou"
-#: builtin/gc.c:1093
+#: builtin/gc.c:1091
#, fuzzy
msgid "failed to write multi-pack-index"
msgstr "falha ao limpar o índice"
-#: builtin/gc.c:1111
+#: builtin/gc.c:1109
msgid "'git multi-pack-index expire' failed"
msgstr ""
-#: builtin/gc.c:1172
+#: builtin/gc.c:1170
#, fuzzy
msgid "'git multi-pack-index repack' failed"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: builtin/gc.c:1181
+#: builtin/gc.c:1179
msgid ""
"skipping incremental-repack task because core.multiPackIndex is disabled"
msgstr ""
-#: builtin/gc.c:1279
+#: builtin/gc.c:1283
#, c-format
msgid "lock file '%s' exists, skipping maintenance"
msgstr ""
-#: builtin/gc.c:1309
+#: builtin/gc.c:1313
#, fuzzy, c-format
msgid "task '%s' failed"
msgstr "falha ao mudar o nome de '%s'"
-#: builtin/gc.c:1389
+#: builtin/gc.c:1395
#, fuzzy, c-format
msgid "'%s' is not a valid task"
msgstr "'%s' é uma tarefa inválida"
-#: builtin/gc.c:1394
+#: builtin/gc.c:1400
#, fuzzy, c-format
msgid "task '%s' cannot be selected multiple times"
-msgstr "tarefa '%s' apenas pode ser selecionada uma vez"
+msgstr "tarefa '%s' apenas pode ser selecionada uma vez"
-#: builtin/gc.c:1409
+#: builtin/gc.c:1415
msgid "run tasks based on the state of the repository"
msgstr ""
-#: builtin/gc.c:1410
+#: builtin/gc.c:1416
msgid "frequency"
msgstr ""
-#: builtin/gc.c:1411
+#: builtin/gc.c:1417
msgid "run tasks based on frequency"
msgstr ""
-#: builtin/gc.c:1414
+#: builtin/gc.c:1420
msgid "do not report progress or other information over stderr"
msgstr ""
-#: builtin/gc.c:1415
+#: builtin/gc.c:1421
msgid "task"
msgstr ""
-#: builtin/gc.c:1416
+#: builtin/gc.c:1422
#, fuzzy
msgid "run a specific task"
msgstr "corre uma tarefa específica"
-#: builtin/gc.c:1433
+#: builtin/gc.c:1439
msgid "use at most one of --auto and --schedule=<frequency>"
msgstr ""
-#: builtin/gc.c:1467
+#: builtin/gc.c:1482
#, fuzzy
msgid "failed to run 'git config'"
msgstr "falha ao escrever para '%s'"
-#: builtin/gc.c:1512
-msgid "another process is scheduling background maintenance"
-msgstr ""
+#: builtin/gc.c:1547
+#, fuzzy, c-format
+msgid "failed to expand path '%s'"
+msgstr "falha ao criar o caminho '%s'%s"
+
+#: builtin/gc.c:1576
+#, fuzzy
+msgid "failed to start launchctl"
+msgstr "Falha ao iniciar emacsclient."
+
+#: builtin/gc.c:1613
+#, fuzzy, c-format
+msgid "failed to create directories for '%s'"
+msgstr "falha ao criar o diretório '%s'"
+
+#: builtin/gc.c:1674
+#, fuzzy, c-format
+msgid "failed to bootstrap service %s"
+msgstr "falha ao remover %s"
+
+#: builtin/gc.c:1745
+#, fuzzy
+msgid "failed to create temp xml file"
+msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/gc.c:1525
+#: builtin/gc.c:1835
+#, fuzzy
+msgid "failed to start schtasks"
+msgstr "falha ao invocar stat de %s"
+
+#: builtin/gc.c:1879
msgid "failed to run 'crontab -l'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:1544
+#: builtin/gc.c:1896
msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
-#: builtin/gc.c:1550
+#: builtin/gc.c:1900
#, fuzzy
msgid "failed to open stdin of 'crontab'"
msgstr "falha ao abrir '%s'"
-#: builtin/gc.c:1592
+#: builtin/gc.c:1942
msgid "'crontab' died"
msgstr ""
-#: builtin/gc.c:1605
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:2000
#, fuzzy
msgid "failed to add repo to global config"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: builtin/gc.c:1615
+#: builtin/gc.c:2010
#, fuzzy
msgid "git maintenance <subcommand> [<options>]"
msgstr "git notes prune [<opções>]"
-#: builtin/gc.c:1634
+#: builtin/gc.c:2029
#, fuzzy, c-format
msgid "invalid subcommand: %s"
msgstr "commit inválido %s"
@@ -15408,12 +16031,12 @@ msgstr "commit inválido %s"
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opções>] [-e] <padrão> [<rev>...] [[--] <caminho>...]"
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falha ao criar thread: %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
@@ -15422,210 +16045,206 @@ msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
-#: builtin/pack-objects.c:2936
+#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
+#: builtin/pack-objects.c:2969
#, c-format
msgid "no threads support, ignoring %s"
msgstr "sem suporte de threads, %s ignorado"
-#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
#, c-format
msgid "unable to read tree (%s)"
msgstr "incapaz ler árvore (%s)"
-#: builtin/grep.c:655
+#: builtin/grep.c:658
#, c-format
msgid "unable to grep from object of type %s"
msgstr "incapaz efetuar grep a objetos do tipo %s"
-#: builtin/grep.c:736
+#: builtin/grep.c:739
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: builtin/grep.c:835
+#: builtin/grep.c:838
msgid "search in index instead of in the work tree"
msgstr "procurar no índice em vez de procurar na árvore de trabalho"
-#: builtin/grep.c:837
+#: builtin/grep.c:840
msgid "find in contents not managed by git"
msgstr "procurar em conteúdos fora da gestão do git"
-#: builtin/grep.c:839
+#: builtin/grep.c:842
msgid "search in both tracked and untracked files"
msgstr "procurar em ficheiros monitorizados e por monitorizar"
-#: builtin/grep.c:841
+#: builtin/grep.c:844
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:843
+#: builtin/grep.c:846
msgid "recursively search in each submodule"
msgstr "procurar recursivamente em cada submódulo"
-#: builtin/grep.c:846
+#: builtin/grep.c:849
msgid "show non-matching lines"
msgstr "mostrar linhas por corresponder"
-#: builtin/grep.c:848
+#: builtin/grep.c:851
msgid "case insensitive matching"
msgstr "correspondência insensível a maiúsculas e minúsculas"
-#: builtin/grep.c:850
+#: builtin/grep.c:853
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:852
+#: builtin/grep.c:855
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:854
+#: builtin/grep.c:857
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:857
+#: builtin/grep.c:860
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:859
+#: builtin/grep.c:862
#, fuzzy
msgid "search in subdirectories (default)"
msgstr "eliminar referências soltas (predefinição)"
-#: builtin/grep.c:861
+#: builtin/grep.c:864
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:865
+#: builtin/grep.c:868
msgid "use extended POSIX regular expressions"
msgstr "usar expressões regulares estendidas do POSIX"
-#: builtin/grep.c:868
+#: builtin/grep.c:871
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expressões regulares básicas do POSIX (predefinição)"
-#: builtin/grep.c:871
+#: builtin/grep.c:874
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:874
+#: builtin/grep.c:877
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:877
+#: builtin/grep.c:880
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:878
+#: builtin/grep.c:881
#, fuzzy
msgid "show column number of first match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:879
+#: builtin/grep.c:882
msgid "don't show filenames"
msgstr "esconder nomes de ficheiro"
-#: builtin/grep.c:880
+#: builtin/grep.c:883
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:882
+#: builtin/grep.c:885
msgid "show filenames relative to top directory"
msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
-#: builtin/grep.c:884
+#: builtin/grep.c:887
msgid "show only filenames instead of matching lines"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: builtin/grep.c:886
+#: builtin/grep.c:889
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:889
+#: builtin/grep.c:892
msgid "show only the names of files without match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:891
+#: builtin/grep.c:894
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:894
+#: builtin/grep.c:897
#, fuzzy
msgid "show only matching parts of a line"
msgstr "mostrar apenas partes da linha correspondentes"
-#: builtin/grep.c:896
+#: builtin/grep.c:899
msgid "show the number of matches instead of matching lines"
msgstr "mostrar o número de correspondências em vez das linha correspondidas"
-#: builtin/grep.c:897
+#: builtin/grep.c:900
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:899
+#: builtin/grep.c:902
msgid "print empty line between matches from different files"
msgstr ""
"imprimir uma linha em branco entre correspondências de diferentes ficheiros"
-#: builtin/grep.c:901
+#: builtin/grep.c:904
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
"mesmo ficheiro"
-#: builtin/grep.c:904
+#: builtin/grep.c:907
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
-#: builtin/grep.c:907
+#: builtin/grep.c:910
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:909
+#: builtin/grep.c:912
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:911
+#: builtin/grep.c:914
msgid "use <n> worker threads"
msgstr "usar <n> threads de trabalho"
-#: builtin/grep.c:912
+#: builtin/grep.c:915
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:915
+#: builtin/grep.c:918
msgid "show a line with the function name before matches"
msgstr "mostrar uma linha com o nome da função antes das correspondências"
-#: builtin/grep.c:917
+#: builtin/grep.c:920
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:920
+#: builtin/grep.c:923
msgid "read patterns from file"
msgstr "ler padrões do ficheiro"
-#: builtin/grep.c:922
+#: builtin/grep.c:925
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:924
+#: builtin/grep.c:927
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:936
+#: builtin/grep.c:939
msgid "indicate hit with exit status without output"
msgstr "indicar correspondência, sem output, com status de saída"
-#: builtin/grep.c:938
+#: builtin/grep.c:941
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar apenas correspondências de ficheiro que tenham todos os padrões"
-#: builtin/grep.c:940
-msgid "show parse tree for grep expression"
-msgstr "mostrar árvore de analise da expressões grep"
-
#: builtin/grep.c:944
msgid "pager"
msgstr "paginador"
@@ -15661,12 +16280,12 @@ msgstr "--untracked insustentada com --recurse-submodules"
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1095 builtin/pack-objects.c:3655
+#: builtin/grep.c:1095 builtin/pack-objects.c:3930
#, fuzzy
msgid "no threads support, ignoring --threads"
msgstr "sem suporte de threads, %s ignorado"
-#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
+#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
@@ -15680,13 +16299,18 @@ msgstr "--open-files-in-pager só funciona na árvore de trabalho"
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached ou --untracked proibidos serem usados com --no-index"
-#: builtin/grep.c:1164
+#: builtin/grep.c:1161
+#, fuzzy
+msgid "--untracked cannot be used with --cached"
+msgstr "--cached ou --untracked proibidos serem usados com --no-index"
+
+#: builtin/grep.c:1167
#, fuzzy
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard proibidos serem usados para conteúdos monitorizados"
-#: builtin/grep.c:1172
+#: builtin/grep.c:1175
#, fuzzy
msgid "both --cached and trees are given"
msgstr "--cached e árvores foram fornecidos simultaneamente."
@@ -15822,12 +16446,12 @@ msgstr "atendeu ao pedido visualizador de man nenhum"
msgid "no info viewer handled the request"
msgstr "atendeu ao pedido visualizador de info nenhum"
-#: builtin/help.c:520 builtin/help.c:531 git.c:337
+#: builtin/help.c:520 builtin/help.c:531 git.c:348
#, fuzzy, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'git %s' é um alias de '%s'"
-#: builtin/help.c:534 git.c:369
+#: builtin/help.c:534 git.c:380
#, fuzzy, c-format
msgid "bad alias.%s string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
@@ -15841,395 +16465,395 @@ msgstr "utilização: %s%s"
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c:222
#, c-format
msgid "object type mismatch at %s"
msgstr "incompatibilidade de tipo de objeto em %s"
-#: builtin/index-pack.c:241
+#: builtin/index-pack.c:242
#, c-format
msgid "did not receive expected object %s"
msgstr "objeto esperado %s ficou por ser recebido"
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c:245
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, obtido %s"
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "incapaz preencher %d byte"
msgstr[1] "incapaz preencher %d bytes"
-#: builtin/index-pack.c:304
+#: builtin/index-pack.c:305
msgid "early EOF"
msgstr "EOF prematuro"
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:306
msgid "read error on input"
msgstr "erro de leitura da entrada"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
msgid "used more bytes than were available"
msgstr "foram usados mais bytes dos que estavam disponíveis"
-#: builtin/index-pack.c:324 builtin/pack-objects.c:619
+#: builtin/index-pack.c:325 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "pacote demasiado grande para a definição atual de off_t"
-#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "o pacote excede o tamanho máximo permitido"
-#: builtin/index-pack.c:342 builtin/repack.c:286
+#: builtin/index-pack.c:343
#, c-format
msgid "unable to create '%s'"
msgstr "incapaz criar '%s'"
-#: builtin/index-pack.c:348
+#: builtin/index-pack.c:349
#, c-format
msgid "cannot open packfile '%s'"
msgstr "incapaz abrir ficheiro de pacote '%s'"
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c:363
msgid "pack signature mismatch"
msgstr "assinatura de pacote faz correspondência nenhuma"
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c:365
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versão de pacote %<PRIu32> insustentada"
-#: builtin/index-pack.c:382
+#: builtin/index-pack.c:383
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:489
#, c-format
msgid "inflate returned %d"
msgstr "a descompactação retornou %d"
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:538
msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:546
msgid "delta base offset is out of bound"
msgstr "offset da base delta está fora do limite"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:554
#, c-format
msgid "unknown object type %d"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/index-pack.c:584
+#: builtin/index-pack.c:585
msgid "cannot pread pack file"
msgstr "incapaz invocar pread sobre ficheiro de pacote"
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:587
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte"
msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes"
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:613
msgid "serious inflate inconsistency"
msgstr "inconsistência de descompactação grave"
-#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
-#: builtin/index-pack.c:826 builtin/index-pack.c:835
+#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
+#: builtin/index-pack.c:827 builtin/index-pack.c:836
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
+#: builtin/index-pack.c:761 builtin/pack-objects.c:171
#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
#, c-format
msgid "unable to read %s"
msgstr "incapaz ler %s"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:825
#, c-format
msgid "cannot read existing object info %s"
msgstr "incapaz ler informação existente de objeto %s"
-#: builtin/index-pack.c:832
+#: builtin/index-pack.c:833
#, c-format
msgid "cannot read existing object %s"
msgstr "incapaz ler objeto existente %s"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob inválido %s"
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
+#: builtin/index-pack.c:850 builtin/index-pack.c:869
#, fuzzy
msgid "fsck error in packed object"
msgstr "ignorar objetos compactados"
-#: builtin/index-pack.c:870
+#: builtin/index-pack.c:871
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nem todos os objetos filhos de %s são alcançáveis"
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
+#: builtin/index-pack.c:932 builtin/index-pack.c:979
msgid "failed to apply delta"
msgstr "falha ao aplicar delta"
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1162
msgid "Receiving objects"
msgstr "A receber objetos"
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1162
msgid "Indexing objects"
msgstr "A indexar objetos"
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1196
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pacote roto (SHA1 sem correspondência)"
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c:1201
msgid "cannot fstat packfile"
msgstr "incapaz fstat ficheiro de pacote"
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c:1204
msgid "pack has junk at the end"
msgstr "pacote com lixo no final"
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c:1216
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "extrema confusão em parse_pack_objects()"
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c:1239
msgid "Resolving deltas"
msgstr "A resolver deltas"
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
+#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
#, c-format
msgid "unable to create thread: %s"
msgstr "incapaz criar thread: %s"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
msgid "confusion beyond insanity"
msgstr "extrema confusão"
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1289
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "concluído com %d objeto local"
msgstr[1] "concluído com %d objetos locais"
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c:1305
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pacote tem %d delta por resolver"
msgstr[1] "pacote tem %d deltas por resolver"
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c:1329
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "incapaz descompactar objeto acrescentado (%d)"
-#: builtin/index-pack.c:1424
+#: builtin/index-pack.c:1425
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s corrompido"
-#: builtin/index-pack.c:1444
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/index-pack.c:1446
+#, fuzzy, c-format
+msgid "packfile name '%s' does not end with '.%s'"
msgstr "ao nome de ficheiro de pacote '%s' falta terminar em '.pack'"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1470
#, fuzzy, c-format
msgid "cannot write %s file '%s'"
msgstr "incapaz escrever ficheiro %s '%s'"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1478
#, fuzzy, c-format
msgid "cannot close written %s file '%s'"
msgstr "incapaz fechar ficheiro %s gravado '%s'"
-#: builtin/index-pack.c:1501
+#: builtin/index-pack.c:1504
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1515
+#: builtin/index-pack.c:1518
msgid "cannot store pack file"
msgstr "incapaz guardar ficheiro de pacote"
-#: builtin/index-pack.c:1523
+#: builtin/index-pack.c:1526
msgid "cannot store index file"
msgstr "incapaz guardar ficheiro index"
-#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
+#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1631
+#: builtin/index-pack.c:1651
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Incapaz abrir ficheiro pack existente '%s'"
-#: builtin/index-pack.c:1633
+#: builtin/index-pack.c:1653
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Incapaz abrir ficheiro idx existente para '%s'"
-#: builtin/index-pack.c:1681
+#: builtin/index-pack.c:1701
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "não-delta: %d objeto"
msgstr[1] "não-delta: %d objetos"
-#: builtin/index-pack.c:1688
+#: builtin/index-pack.c:1708
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "comprimento de cadeia = %d: %lu objeto"
msgstr[1] "comprimento de cadeia = %d: %lu objetos"
-#: builtin/index-pack.c:1728
+#: builtin/index-pack.c:1750
msgid "Cannot come back to cwd"
msgstr "Incapaz voltar a cwd"
-#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
-#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
+#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
+#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
#, c-format
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
+#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
#, fuzzy, c-format
msgid "unknown hash algorithm '%s'"
msgstr "Formato de arquivo desconhecido '%s'"
-#: builtin/index-pack.c:1821
+#: builtin/index-pack.c:1852
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin requer ser usado com --stdin"
-#: builtin/index-pack.c:1823
+#: builtin/index-pack.c:1854
msgid "--stdin requires a git repository"
msgstr "--stdin requer um repositório git"
-#: builtin/index-pack.c:1825
+#: builtin/index-pack.c:1856
#, fuzzy
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format incapaz ser usado com --stdin"
-#: builtin/index-pack.c:1831
+#: builtin/index-pack.c:1871
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
-#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
#, fuzzy
msgid "fsck error in pack objects"
msgstr "erro no objeto: %s"
-#: builtin/init-db.c:64
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "incapaz obter estatutário a modelo '%s'"
-#: builtin/init-db.c:69
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "incapaz opendir '%s'"
-#: builtin/init-db.c:81
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "incapaz readlink '%s'"
-#: builtin/init-db.c:83
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "incapaz symlink '%s' '%s'"
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "incapaz copiar '%s' para '%s'"
-#: builtin/init-db.c:93
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "ignorando modelo %s"
-#: builtin/init-db.c:124
+#: builtin/init-db.c:123
#, fuzzy, c-format
msgid "templates not found in %s"
msgstr "modelos em %s por encontrar"
-#: builtin/init-db.c:139
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "deixando de copiar modelos de '%s': %s"
-#: builtin/init-db.c:274
+#: builtin/init-db.c:262
#, fuzzy, c-format
msgid "invalid initial branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/init-db.c:366
+#: builtin/init-db.c:353
#, c-format
msgid "unable to handle file type %d"
msgstr "incapaz lidar com tipo de ficheiro %d"
-#: builtin/init-db.c:369
+#: builtin/init-db.c:356
#, c-format
msgid "unable to move %s to %s"
msgstr "incapaz mover %s para %s"
-#: builtin/init-db.c:385
+#: builtin/init-db.c:372
msgid "attempt to reinitialize repository with different hash"
msgstr ""
-#: builtin/init-db.c:409 builtin/init-db.c:412
+#: builtin/init-db.c:396 builtin/init-db.c:399
#, c-format
msgid "%s already exists"
msgstr "%s já existe"
-#: builtin/init-db.c:443
+#: builtin/init-db.c:431
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr ""
-#: builtin/init-db.c:474
+#: builtin/init-db.c:462
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Reiniciei respositório partilhado existente de Git em %s%s\n"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:463
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Reiniciei repositório existente de Git em %s%s\n"
-#: builtin/init-db.c:479
+#: builtin/init-db.c:467
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Iniciei repositório vazio partilhado de Git em %s%s\n"
-#: builtin/init-db.c:480
+#: builtin/init-db.c:468
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Iniciei repositório vazio de Git em %s%s\n"
-#: builtin/init-db.c:529
+#: builtin/init-db.c:517
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -16237,44 +16861,44 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
"shared[=<permissões>]] [<diretório>]"
-#: builtin/init-db.c:555
+#: builtin/init-db.c:543
msgid "permissions"
msgstr "permissões"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:544
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"especificar que o repositório git será partilhado por vários utilizadores"
-#: builtin/init-db.c:562
+#: builtin/init-db.c:550
#, fuzzy
msgid "override the name of the initial branch"
msgstr "substituir o bit executável dos ficheiros listados"
-#: builtin/init-db.c:563 builtin/verify-pack.c:74
+#: builtin/init-db.c:551 builtin/verify-pack.c:74
msgid "hash"
msgstr ""
-#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr ""
-#: builtin/init-db.c:571
+#: builtin/init-db.c:559
#, fuzzy
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/init-db.c:600 builtin/init-db.c:605
+#: builtin/init-db.c:590 builtin/init-db.c:595
#, c-format
msgid "cannot mkdir %s"
msgstr "incapaz mkdir %s"
-#: builtin/init-db.c:609 builtin/init-db.c:664
+#: builtin/init-db.c:599 builtin/init-db.c:654
#, c-format
msgid "cannot chdir to %s"
msgstr "incapaz chdir para %s"
-#: builtin/init-db.c:636
+#: builtin/init-db.c:626
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16283,12 +16907,12 @@ msgstr ""
"%s (ou --work-tree=<diretório>) só é permitido se especificar %s (ou --git-"
"dir=<diretório>)"
-#: builtin/init-db.c:688
+#: builtin/init-db.c:678
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Incapaz aceder work tree '%s'"
-#: builtin/init-db.c:693
+#: builtin/init-db.c:683
#, fuzzy
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir incompatível com repositório nú"
@@ -16345,10 +16969,6 @@ msgstr "Opções de integração"
msgid "do not treat --- specially"
msgstr ""
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "terminador"
-
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "terminadores a adicionar"
@@ -16362,137 +16982,139 @@ msgstr "--trailer com --only-input faz sentido nenhum"
msgid "no input file given for in-place editing"
msgstr "fornecido para edição in-place, ficheiro de entrada nenhum"
-#: builtin/log.c:58
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<opções>] <objeto>..."
-#: builtin/log.c:112
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opção --decorate inválida: %s"
-#: builtin/log.c:179
+#: builtin/log.c:180
msgid "show source"
msgstr "mostrar origem"
-#: builtin/log.c:180
-msgid "Use mail map file"
+#: builtin/log.c:181
+#, fuzzy
+msgid "use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
-#: builtin/log.c:183
+#: builtin/log.c:184
#, fuzzy
msgid "only decorate refs that match <pattern>"
msgstr "usar apenas referência que correspondam ao <padrão>"
-#: builtin/log.c:185
+#: builtin/log.c:186
#, fuzzy
msgid "do not decorate refs that match <pattern>"
msgstr "deixar por decorar refs correspondentes a <padrão>"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "decorate options"
msgstr "opções de decoração"
-#: builtin/log.c:189
+#: builtin/log.c:190
+#, fuzzy
msgid ""
-"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
-msgstr ""
+msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
-#: builtin/log.c:212
+#: builtin/log.c:213
#, fuzzy
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path"
-#: builtin/log.c:302
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output final: %d %s\n"
-#: builtin/log.c:564
+#: builtin/log.c:568
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ficheiro incorreto"
-#: builtin/log.c:579 builtin/log.c:674
+#: builtin/log.c:583 builtin/log.c:673
#, fuzzy, c-format
msgid "could not read object %s"
msgstr "incapaz ler objeto %s"
-#: builtin/log.c:699
+#: builtin/log.c:698
#, fuzzy, c-format
msgid "unknown type: %d"
msgstr "Tipo desconhecido: %d"
-#: builtin/log.c:848
+#: builtin/log.c:843
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:855
+#: builtin/log.c:850
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:984
+#: builtin/log.c:979
#, fuzzy, c-format
msgid "cannot open patch file %s"
msgstr "incapaz abrir ficheiro patch %s"
-#: builtin/log.c:1001
+#: builtin/log.c:996
#, fuzzy
msgid "need exactly one range"
msgstr "É necessário exatamente um intervalo."
-#: builtin/log.c:1011
+#: builtin/log.c:1006
#, fuzzy
msgid "not a range"
msgstr "é intervalo nenhum"
-#: builtin/log.c:1175
+#: builtin/log.c:1170
#, fuzzy
msgid "cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
-#: builtin/log.c:1181
+#: builtin/log.c:1176
#, fuzzy
msgid "failed to create cover-letter file"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1262
+#: builtin/log.c:1263
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1289
+#: builtin/log.c:1290
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1347
+#: builtin/log.c:1348
#, fuzzy
msgid "two output directories?"
msgstr "Dois diretórios de saída?"
-#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
+#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
#, fuzzy, c-format
msgid "unknown commit %s"
msgstr "Commit desconhecido %s"
-#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, fuzzy, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "falha ao resolver '%s' como uma referência válida."
-#: builtin/log.c:1518
+#: builtin/log.c:1519
#, fuzzy
msgid "could not find exact merge base"
msgstr "incapaz encontrar a exata base de junção."
-#: builtin/log.c:1528
+#: builtin/log.c:1529
#, fuzzy
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
@@ -16504,407 +17126,422 @@ msgstr ""
"use branch --set-upstream-to para seguir um ramo remoto.\n"
"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
-#: builtin/log.c:1551
+#: builtin/log.c:1552
#, fuzzy
msgid "failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
-#: builtin/log.c:1568
+#: builtin/log.c:1569
msgid "base commit should be the ancestor of revision list"
msgstr "o commit base deve ser o antecessor da lista de revisões"
-#: builtin/log.c:1578
+#: builtin/log.c:1579
msgid "base commit shouldn't be in revision list"
msgstr "commit base devia estar fora da lista de revisões"
-#: builtin/log.c:1636
+#: builtin/log.c:1637
msgid "cannot get patch id"
msgstr "incapaz obter id de patch"
-#: builtin/log.c:1693
+#: builtin/log.c:1700
#, fuzzy
msgid "failed to infer range-diff origin of current series"
msgstr "falha ao guardar ligação à referência de notas atual (%s)"
-#: builtin/log.c:1695
+#: builtin/log.c:1702
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1739
+#: builtin/log.c:1746
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1742
+#: builtin/log.c:1749
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1746
+#: builtin/log.c:1753
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1748
+#: builtin/log.c:1755
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1750
+#: builtin/log.c:1757
msgid "use simple number sequence for output file names"
msgstr ""
"usar uma sequência de números simples para denominar os ficheiros gerados"
-#: builtin/log.c:1751
+#: builtin/log.c:1758
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1752
+#: builtin/log.c:1759
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1754
+#: builtin/log.c:1761
msgid "start numbering patches at <n> instead of 1"
msgstr "começar a numerar os patches em <n> em vez de 1"
-#: builtin/log.c:1756
+#: builtin/log.c:1762
+msgid "reroll-count"
+msgstr ""
+
+#: builtin/log.c:1763
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1758
+#: builtin/log.c:1765
#, fuzzy
msgid "max length of output filename"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/log.c:1760
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1767
+#, fuzzy
+msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "Usar [RFC PATCH] em vez de [PATCH]"
-#: builtin/log.c:1763
+#: builtin/log.c:1770
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1764
+#: builtin/log.c:1771
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-#: builtin/log.c:1766
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1773
+#, fuzzy
+msgid "use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1769
+#: builtin/log.c:1776
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1772
+#: builtin/log.c:1779
msgid "don't strip/add [PATCH]"
msgstr "deixar de despir/adicionar [PATCH]"
-#: builtin/log.c:1775
+#: builtin/log.c:1782
msgid "don't output binary diffs"
msgstr "deixar de gerar diffs binários"
-#: builtin/log.c:1777
+#: builtin/log.c:1784
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1779
+#: builtin/log.c:1786
msgid "don't include a patch matching a commit upstream"
msgstr "incluir nenhum patch correspondente commit upstream"
-#: builtin/log.c:1781
+#: builtin/log.c:1788
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
-#: builtin/log.c:1783
+#: builtin/log.c:1790
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1784
+#: builtin/log.c:1791
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1785
+#: builtin/log.c:1792
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1786 builtin/log.c:1787
+#: builtin/log.c:1793 builtin/log.c:1794
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1786
+#: builtin/log.c:1793
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1787
+#: builtin/log.c:1794
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1788
+#: builtin/log.c:1795
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1789
+#: builtin/log.c:1796
msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "definir endereço From para <identidade> (ou, identidade do committer, caso contrário)"
+msgstr ""
+"definir endereço From para <identidade> (ou, identidade do committer, caso "
+"contrário)"
-#: builtin/log.c:1791
+#: builtin/log.c:1798
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1792
+#: builtin/log.c:1799
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1793 builtin/log.c:1796
+#: builtin/log.c:1800 builtin/log.c:1803
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1794
+#: builtin/log.c:1801
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1797
+#: builtin/log.c:1804
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1801
+#: builtin/log.c:1808
msgid "enable message threading, styles: shallow, deep"
msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
-#: builtin/log.c:1803
+#: builtin/log.c:1810
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1804
+#: builtin/log.c:1811
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1805
+#: builtin/log.c:1812
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1806
+#: builtin/log.c:1813
msgid "add prerequisite tree info to the patch series"
msgstr "adicionar informação pré-requisito da árvore à série de patches"
-#: builtin/log.c:1809
+#: builtin/log.c:1816
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1810
+#: builtin/log.c:1817
msgid "don't print the patch filenames"
msgstr "imprimir nomes de ficheiros de patch nenhuns"
-#: builtin/log.c:1812
+#: builtin/log.c:1819
#, fuzzy
msgid "show progress while generating patches"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/log.c:1814
+#: builtin/log.c:1821
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1817
+#: builtin/log.c:1824
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1819
+#: builtin/log.c:1826 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1905
+#: builtin/log.c:1913
#, c-format
msgid "invalid ident line: %s"
msgstr "linha de identidade inválida: %s"
-#: builtin/log.c:1920
+#: builtin/log.c:1928
#, fuzzy
msgid "-n and -k are mutually exclusive"
msgstr "-n e -k são mutuamente exclusivos."
-#: builtin/log.c:1922
+#: builtin/log.c:1930
#, fuzzy
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
-#: builtin/log.c:1930
+#: builtin/log.c:1938
msgid "--name-only does not make sense"
msgstr "--name-only faz sentido nenhum"
-#: builtin/log.c:1932
+#: builtin/log.c:1940
msgid "--name-status does not make sense"
msgstr "--name-status faz sentido nenhum"
-#: builtin/log.c:1934
+#: builtin/log.c:1942
msgid "--check does not make sense"
msgstr "--check faz sentido nenhum"
-#: builtin/log.c:1956
+#: builtin/log.c:1964
#, fuzzy
msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/log.c:2079
+#: builtin/log.c:2087
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2083
+#: builtin/log.c:2091
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:2084
+#: builtin/log.c:2092
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:2090
+#: builtin/log.c:2098
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:2094
+#: builtin/log.c:2102
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2102
+#: builtin/log.c:2110
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:2103
+#: builtin/log.c:2111
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:2114
+#: builtin/log.c:2122
#, c-format
msgid "unable to read signature file '%s'"
msgstr "incapaz ler ficheiro de assinatura '%s'"
-#: builtin/log.c:2150
+#: builtin/log.c:2158
#, fuzzy
msgid "Generating patches"
msgstr "falha ao editar patch"
-#: builtin/log.c:2194
+#: builtin/log.c:2202
#, fuzzy
msgid "failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:2253
+#: builtin/log.c:2261
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:2307
+#: builtin/log.c:2315
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "Incapaz encontrar ramo monitorizado remoto, por favor especifica <upstream> manualmente.\n"
+msgstr ""
+"Incapaz encontrar ramo monitorizado remoto, por favor especifica <upstream> "
+"manualmente.\n"
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:563
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opções>] [<ficheiro>...]"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:619
msgid "identify the file status with tags"
msgstr "identificar o estado do ficheiro com tags"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:621
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para ficheiros 'assume unchanged'"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:623
#, fuzzy
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para ficheiros 'fsmonitor clean'"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:625
msgid "show cached files in the output (default)"
msgstr "mostrar ficheiros em cache na saída (predefinição)"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:627
msgid "show deleted files in the output"
msgstr "mostrar ficheiros eliminados na saída"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:629
msgid "show modified files in the output"
msgstr "mostrar ficheiros modificados na saída"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:631
msgid "show other files in the output"
msgstr "mostrar outros ficheiros na saída"
-#: builtin/ls-files.c:541
+#: builtin/ls-files.c:633
msgid "show ignored files in the output"
msgstr "mostrar ficheiros ignorados na saída"
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:636
msgid "show staged contents' object name in the output"
msgstr "mostrar nome de objetos com conteúdo preparado, na saída"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:638
msgid "show files on the filesystem that need to be removed"
msgstr ""
"mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:640
msgid "show 'other' directories' names only"
msgstr "mostrar nomes de diretórios 'other' (outro)"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:642
msgid "show line endings of files"
msgstr "mostrar finais de linha dos ficheiros"
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:644
msgid "don't show empty directories"
msgstr "mostrar pastas vazias nenhumas"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:647
msgid "show unmerged files in the output"
msgstr "mostrar ficheiros por juntar no output"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:649
msgid "show resolve-undo information"
msgstr "mostrar informação de resolver-desfazer"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:651
msgid "skip files matching pattern"
msgstr "ignorar ficheiros que correspondam ao padrão"
-#: builtin/ls-files.c:562
+#: builtin/ls-files.c:654
msgid "exclude patterns are read from <file>"
msgstr "ler padrões de exclusão do <ficheiro>"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:657
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ler padrões de exclusão por diretório do <ficheiro>"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:659
msgid "add the standard git exclusions"
msgstr "incluir as exclusões standard do git"
-#: builtin/ls-files.c:571
+#: builtin/ls-files.c:663
msgid "make the output relative to the project top directory"
msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:666
msgid "recurse through submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:668
msgid "if any <file> is not in the index, treat this as an error"
msgstr "se estiver no index <ficheiro> nenhum, tratar como erro"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:669
msgid "tree-ish"
msgstr "árvore-etc"
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:670
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
-#: builtin/ls-files.c:580
+#: builtin/ls-files.c:672
msgid "show debugging data"
msgstr "mostrar dados de depuração"
+#: builtin/ls-files.c:674
+#, fuzzy
+msgid "suppress duplicate entries"
+msgstr "suprimir a cadeias de caracteres de nomes"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -16915,39 +17552,39 @@ msgstr ""
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<repositório> [<referências>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "imprimir URL remoto nenhum"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "caminho para git-upload-pack no servidor remoto"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "restringir-se a tags"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "restringir-se a cabeças"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "mostrar nenhumas tags descascadas"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "ter url.<base>.insteadOf em conta"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "terminar com código de saída 2 se forem encontradas refs nenhumas"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado"
@@ -16985,7 +17622,61 @@ msgstr "usar nomes de caminho completos"
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "listar toda árvore; e para além do diretório atual (implica --full-name)"
+msgstr ""
+"listar toda árvore; e para além do diretório atual (implica --full-name)"
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+#, fuzzy
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git merge [<opções>] <msg> HEAD <commit>"
+
+#: builtin/mailinfo.c:58
+#, fuzzy
+msgid "keep subject"
+msgstr "manter objetos inalcançáveis"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr ""
+
+#: builtin/mailinfo.c:62
+#, fuzzy
+msgid "copy Message-ID to the end of commit message"
+msgstr "Esta é a 2ª mensagem de commit:"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr ""
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr ""
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr ""
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr ""
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr ""
+
+#: builtin/mailinfo.c:73
+#, fuzzy
+msgid "<action>"
+msgstr "ação"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr ""
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr ""
#: builtin/mailsplit.c:241
#, c-format
@@ -17104,193 +17795,195 @@ msgstr "incapaz resolver ref '%s'"
msgid "Merging %s with %s\n"
msgstr "Juntando %s com %s\n"
-#: builtin/merge.c:57
+#: builtin/merge.c:58
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opções>] [<commit>...]"
-#: builtin/merge.c:58
+#: builtin/merge.c:59
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:59
+#: builtin/merge.c:60
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:122
+#: builtin/merge.c:123
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
-#: builtin/merge.c:145
+#: builtin/merge.c:146
#, fuzzy, c-format
msgid "option `%s' requires a value"
msgstr "a opção '%s' requer um valor"
-#: builtin/merge.c:198
+#: builtin/merge.c:199
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Incapaz encontrar estratégia de junção '%s'.\n"
-#: builtin/merge.c:199
+#: builtin/merge.c:200
#, c-format
msgid "Available strategies are:"
msgstr "Estratégias disponíveis:"
-#: builtin/merge.c:204
+#: builtin/merge.c:205
#, c-format
msgid "Available custom strategies are:"
msgstr "Estratégias personalizadas disponíveis:"
-#: builtin/merge.c:255 builtin/pull.c:133
+#: builtin/merge.c:256 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "mostrar diffstat nenhuma ao fim da junção"
-#: builtin/merge.c:258 builtin/pull.c:136
+#: builtin/merge.c:259 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "mostrar um diffstat ao fim da junção"
-#: builtin/merge.c:259 builtin/pull.c:139
+#: builtin/merge.c:260 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(sinónimo de --stat)"
-#: builtin/merge.c:261 builtin/pull.c:142
+#: builtin/merge.c:262 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
"integração"
-#: builtin/merge.c:264 builtin/pull.c:148
+#: builtin/merge.c:265 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "criar um único commit em vez de realizar uma integração"
-#: builtin/merge.c:266 builtin/pull.c:151
+#: builtin/merge.c:267 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
-#: builtin/merge.c:268 builtin/pull.c:154
+#: builtin/merge.c:269 builtin/pull.c:154
msgid "edit message before committing"
msgstr "editar a mensagem antes de submeter"
-#: builtin/merge.c:270
+#: builtin/merge.c:271
msgid "allow fast-forward (default)"
msgstr "permitir avanço rápido (predefinição)"
-#: builtin/merge.c:272 builtin/pull.c:161
+#: builtin/merge.c:273 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "abortar se fast-forward é impossível"
-#: builtin/merge.c:276 builtin/pull.c:164
+#: builtin/merge.c:277 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar se o commit tem uma assinatura GPG válida"
-#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
msgid "strategy"
msgstr "estratégia"
-#: builtin/merge.c:278 builtin/pull.c:169
+#: builtin/merge.c:279 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "estratégia de integração a usar"
-#: builtin/merge.c:279 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/pull.c:172
msgid "option=value"
msgstr "opção=valor"
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "opções da estratégia de integração selecionada"
-#: builtin/merge.c:282
+#: builtin/merge.c:283
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "mensagem de commit de junção (para junções non-fast-forward)"
-#: builtin/merge.c:289
+#: builtin/merge.c:290
msgid "abort the current in-progress merge"
msgstr "abortar integração em curso"
-#: builtin/merge.c:291
+#: builtin/merge.c:292
#, fuzzy
msgid "--abort but leave index and working tree alone"
msgstr "repor HEAD, índice e árvore de trabalho"
-#: builtin/merge.c:293
+#: builtin/merge.c:294
msgid "continue the current in-progress merge"
msgstr "continuar a integração em curso"
-#: builtin/merge.c:295 builtin/pull.c:180
+#: builtin/merge.c:296 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "permitir junção de históricos diferentes"
-#: builtin/merge.c:302
+#: builtin/merge.c:303
#, fuzzy
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "ignorar pre-commit e commit-msg hooks"
-#: builtin/merge.c:319
+#: builtin/merge.c:320
msgid "could not run stash."
msgstr "incapaz executar stash."
-#: builtin/merge.c:324
+#: builtin/merge.c:325
msgid "stash failed"
msgstr "falha ao executar o comando stash"
-#: builtin/merge.c:329
+#: builtin/merge.c:330
#, c-format
msgid "not a valid object: %s"
msgstr "nome de objeto inválido: %s"
-#: builtin/merge.c:351 builtin/merge.c:368
+#: builtin/merge.c:352 builtin/merge.c:369
msgid "read-tree failed"
msgstr "falha ao executar o comando read-tree"
-#: builtin/merge.c:398
-msgid " (nothing to squash)"
+#: builtin/merge.c:400
+#, fuzzy
+msgid "Already up to date. (nothing to squash)"
msgstr " (nada para esmagar)"
-#: builtin/merge.c:409
+#: builtin/merge.c:414
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- deixar HEAD por atualizar\n"
-#: builtin/merge.c:459
+#: builtin/merge.c:464
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Mensagem de junção nenhuma -- deixar HEAD por atualizar\n"
-#: builtin/merge.c:510
+#: builtin/merge.c:515
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' aponta para commit nenhum"
-#: builtin/merge.c:597
+#: builtin/merge.c:602
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
-#: builtin/merge.c:723
+#: builtin/merge.c:728
msgid "Not handling anything other than two heads merge."
msgstr "Lidando nada além da junção de duas heads."
-#: builtin/merge.c:736
+#: builtin/merge.c:741
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opção desconhecida de merge-recursive: -X%s"
-#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
#, c-format
msgid "unable to write %s"
msgstr "incapaz escrever %s"
-#: builtin/merge.c:807
+#: builtin/merge.c:812
#, c-format
msgid "Could not read from '%s'"
msgstr "Incapaz ler de '%s'"
-#: builtin/merge.c:816
+#: builtin/merge.c:821
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
+msgstr ""
+"Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
-#: builtin/merge.c:822
+#: builtin/merge.c:827
#, fuzzy
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -17302,12 +17995,12 @@ msgstr ""
"branch.\n"
"\n"
-#: builtin/merge.c:827
+#: builtin/merge.c:832
#, fuzzy
msgid "An empty message aborts the commit.\n"
msgstr "Uma mensagem vazia aborta o commit.\n"
-#: builtin/merge.c:830
+#: builtin/merge.c:835
#, fuzzy, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17316,75 +18009,75 @@ msgstr ""
"Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"
"o commit.\n"
-#: builtin/merge.c:883
+#: builtin/merge.c:888
msgid "Empty commit message."
msgstr "Mensagem commit vazia."
-#: builtin/merge.c:898
+#: builtin/merge.c:903
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilhoso.\n"
-#: builtin/merge.c:959
+#: builtin/merge.c:964
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Merge automático falhou; resolve os conflitos e depois podes commitar o "
"resultado.\n"
-#: builtin/merge.c:998
+#: builtin/merge.c:1003
msgid "No current branch."
msgstr "Nenhum ramo atual."
-#: builtin/merge.c:1000
+#: builtin/merge.c:1005
msgid "No remote for the current branch."
msgstr "Ŕamo atual de remoto nenhum."
-#: builtin/merge.c:1002
+#: builtin/merge.c:1007
msgid "No default upstream defined for the current branch."
msgstr "Ramo atual sem upstream default definido."
-#: builtin/merge.c:1007
+#: builtin/merge.c:1012
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
-#: builtin/merge.c:1064
+#: builtin/merge.c:1069
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor '%s' incorreto no ambiente '%s'"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1172
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "podemos juntar em %s nenhum(a): %s"
-#: builtin/merge.c:1201
+#: builtin/merge.c:1206
msgid "not something we can merge"
msgstr "podemos juntar nada"
-#: builtin/merge.c:1311
+#: builtin/merge.c:1316
msgid "--abort expects no arguments"
msgstr "--abort supõe argumento nenhum"
-#: builtin/merge.c:1315
+#: builtin/merge.c:1320
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
-#: builtin/merge.c:1333
+#: builtin/merge.c:1338
#, fuzzy
msgid "--quit expects no arguments"
msgstr "--abort supõe argumento nenhum"
-#: builtin/merge.c:1346
+#: builtin/merge.c:1351
msgid "--continue expects no arguments"
msgstr "--continue supõe argumento nenhum"
-#: builtin/merge.c:1350
+#: builtin/merge.c:1355
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1371
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17392,7 +18085,7 @@ msgstr ""
"Junção está por concluir (MERGE_HEAD existe).\n"
"Por favor, faz commit das tuas alterações antes de juntar."
-#: builtin/merge.c:1373
+#: builtin/merge.c:1378
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -17400,103 +18093,135 @@ msgstr ""
"Cherry-pick por concluir (existe CHERRY_PICK_HEAD).\n"
"Por favor, memorize suas alterações antes de juntar."
-#: builtin/merge.c:1376
+#: builtin/merge.c:1381
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Cherry-pick por concluir (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1390
+#: builtin/merge.c:1395
msgid "You cannot combine --squash with --no-ff."
msgstr "Impossível combinar --squash com --no-ff."
-#: builtin/merge.c:1392
+#: builtin/merge.c:1397
#, fuzzy
msgid "You cannot combine --squash with --commit."
msgstr "Impossível combinar --squash com --commit."
-#: builtin/merge.c:1408
+#: builtin/merge.c:1413
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Especificado commit nenhum e merge.defaultToUpstream indefinido."
-#: builtin/merge.c:1425
+#: builtin/merge.c:1430
msgid "Squash commit into empty head not supported yet"
msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum"
-#: builtin/merge.c:1427
+#: builtin/merge.c:1432
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum"
-#: builtin/merge.c:1432
+#: builtin/merge.c:1437
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que se pode juntar"
-#: builtin/merge.c:1434
+#: builtin/merge.c:1439
msgid "Can merge only exactly one commit into empty head"
msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1520
msgid "refusing to merge unrelated histories"
msgstr "recusando juntar históricos diferentes"
-#: builtin/merge.c:1524
-#, fuzzy
-msgid "Already up to date."
-msgstr "Já está atualizado."
-
-#: builtin/merge.c:1534
+#: builtin/merge.c:1539
#, c-format
msgid "Updating %s..%s\n"
msgstr "Atualizando %s..%s\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1585
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "A tentar integração mesmo trivial no interior do índice...\n"
-#: builtin/merge.c:1587
+#: builtin/merge.c:1592
#, c-format
msgid "Nope.\n"
msgstr "Nada.\n"
-#: builtin/merge.c:1612
-#, fuzzy
-msgid "Already up to date. Yeeah!"
-msgstr "Já está atualizado. Sim!"
-
-#: builtin/merge.c:1618
+#: builtin/merge.c:1623
msgid "Not possible to fast-forward, aborting."
msgstr "Impossível fazer fast-forward, abortando."
-#: builtin/merge.c:1646 builtin/merge.c:1711
+#: builtin/merge.c:1651 builtin/merge.c:1716
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Recuando a árvore para estado pristino...\n"
-#: builtin/merge.c:1650
+#: builtin/merge.c:1655
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Tentando estratégia merge %s...\n"
-#: builtin/merge.c:1702
+#: builtin/merge.c:1707
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "A junção lidou com estratégia de junção nenhuma.\n"
-#: builtin/merge.c:1704
+#: builtin/merge.c:1709
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Falha ao integrar com a estratégia %s.\n"
-#: builtin/merge.c:1713
+#: builtin/merge.c:1718
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "A usar %s para preparar resolução manual.\n"
-#: builtin/merge.c:1727
+#: builtin/merge.c:1732
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr ""
+
+#: builtin/mktag.c:27
+#, fuzzy, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "aviso: `:include:` insustentado: %s\n"
+
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr ""
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr ""
+
+#: builtin/mktag.c:56
+#, fuzzy, c-format
+msgid "could not read tagged object '%s'"
+msgstr "incapaz ler objeto %s"
+
+#: builtin/mktag.c:59
+#, fuzzy, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objeto %s é %s, é %s nenhum(a)"
+
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+
+#: builtin/mktag.c:100
+#, fuzzy
+msgid "tag on stdin did not refer to a valid object"
+msgstr "'%s' aponta para objeto válido nenhum!"
+
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "incapaz escrever ficheiro de tag"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -17513,32 +18238,45 @@ msgstr "permitir objetos que faltam"
msgid "allow creation of more than one tree"
msgstr "permitir a criação de mais do que uma árvore"
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
-msgstr ""
+#: builtin/multi-pack-index.c:10
+#, fuzzy
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
+
+#: builtin/multi-pack-index.c:13
+#, fuzzy
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git upload-pack [<opções>] <dir>"
+
+#: builtin/multi-pack-index.c:16
+#, fuzzy
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git upload-pack [<opções>] <dir>"
+
+#: builtin/multi-pack-index.c:19
+#, fuzzy
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/multi-pack-index.c:26
+#: builtin/multi-pack-index.c:54
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:29
-msgid ""
-"during repack, collect pack-files of smaller size into a batch that is "
-"larger than this size"
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
msgstr ""
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
-#, fuzzy
-msgid "too many arguments"
-msgstr "Demasiados argumentos."
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
+#: builtin/multi-pack-index.c:128
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
msgstr ""
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:180
#, fuzzy, c-format
msgid "unrecognized subcommand: %s"
msgstr "subcomando desconhecido: %s"
@@ -17635,7 +18373,7 @@ msgstr "%s, origem=%s, destino=%s"
msgid "Renaming %s to %s\n"
msgstr "A mudar de nome de %s para %s\n"
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
#, c-format
msgid "renaming '%s' failed"
msgstr "falha ao mudar o nome de '%s'"
@@ -17827,7 +18565,7 @@ msgstr "incapaz escrever para objeto de nota"
msgid "the note contents have been left in %s"
msgstr "o conteúdo da nota foi colocado em %s"
-#: builtin/notes.c:242 builtin/tag.c:533
+#: builtin/notes.c:242 builtin/tag.c:576
#, c-format
msgid "could not open or read '%s'"
msgstr "incapaz abrir ou ler '%s'"
@@ -17870,8 +18608,10 @@ msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"
#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-msgid "too many parameters"
-msgstr "demasiados parâmetros"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+#, fuzzy
+msgid "too many arguments"
+msgstr "Demasiados argumentos."
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
@@ -17930,8 +18670,9 @@ msgid "load rewriting config for <command> (implies --stdin)"
msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "parâmetros insuficientes"
+#, fuzzy
+msgid "too few arguments"
+msgstr "Demasiados argumentos."
#: builtin/notes.c:538
#, c-format
@@ -17939,8 +18680,8 @@ msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' para "
-"subscrever notas existentes"
+"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' "
+"para subscrever notas existentes"
#: builtin/notes.c:550
#, c-format
@@ -18059,7 +18800,7 @@ msgstr ""
"submeta o resultado com 'git notes merge --commit' ou aborte a integração "
"com 'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:546
+#: builtin/notes.c:897 builtin/tag.c:589
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falha ao resolver '%s' numa referência válida."
@@ -18077,7 +18818,7 @@ msgstr "apenas é erro se remover nota existente"
msgid "read object names from the standard input"
msgstr "ler nome dos objetos da entrada padrão"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "remover nada, apenas mostrar"
@@ -18093,7 +18834,7 @@ msgstr "notes-ref"
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1604
+#: builtin/notes.c:1034 builtin/stash.c:1739
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconhecido: %s"
@@ -18112,381 +18853,428 @@ msgstr ""
"git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:443
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:448
#, fuzzy, c-format
msgid "bad packed object CRC for %s"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:454
+#: builtin/pack-objects.c:459
#, fuzzy, c-format
msgid "corrupt packed object for %s"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:585
+#: builtin/pack-objects.c:590
#, fuzzy, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo detetado para objeto %s"
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1004
+#: builtin/pack-objects.c:896
+#, fuzzy, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"a desativar escrita de mapa de bits, os pacotes são divididos devido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:1078 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falha ao invocar stat de %s"
-#: builtin/pack-objects.c:1131
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1348
+#: builtin/pack-objects.c:1383
msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "desativando escrita bitmap, visto a incapacidade de alguns objetos "
-"serem compactados"
+msgstr ""
+"desativando escrita bitmap, visto a incapacidade de alguns objetos serem "
+"compactados"
-#: builtin/pack-objects.c:1796
+#: builtin/pack-objects.c:1831
#, fuzzy, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "offset da base delta está fora do limite"
-#: builtin/pack-objects.c:1805
+#: builtin/pack-objects.c:1840
#, fuzzy, c-format
msgid "delta base offset out of bound for %s"
msgstr "offset da base delta está fora do limite"
-#: builtin/pack-objects.c:2086
+#: builtin/pack-objects.c:2121
msgid "Counting objects"
msgstr "A contar objetos"
-#: builtin/pack-objects.c:2231
+#: builtin/pack-objects.c:2266
#, fuzzy, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz processar cabeçalho de objeto de %s"
-#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
-#: builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
+#: builtin/pack-objects.c:2362
#, fuzzy, c-format
msgid "object %s cannot be read"
msgstr "objeto %s incapaz ser lido"
-#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
+#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2376
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2691
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2830
#, fuzzy, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2916
msgid "Compressing objects"
msgstr "A comprimir objetos"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2922
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2961
+#: builtin/pack-objects.c:3001
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:3004
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3039
+#, fuzzy, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "incapaz obter tipo de objeto %s"
+
+#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#, fuzzy, c-format
+msgid "could not find pack '%s'"
+msgstr "incapaz acabar '%s'"
+
+#: builtin/pack-objects.c:3218
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3224
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3097
+#: builtin/pack-objects.c:3322
#, fuzzy
msgid "invalid value for --missing"
msgstr "valor inválido de %s"
-#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
#, fuzzy
msgid "cannot open pack index"
msgstr "incapaz abrir index pack"
-#: builtin/pack-objects.c:3187
+#: builtin/pack-objects.c:3412
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3498
#, fuzzy
msgid "unable to force loose object"
msgstr "incapaz forçar objeto solto"
-#: builtin/pack-objects.c:3365
+#: builtin/pack-objects.c:3628
#, fuzzy, c-format
msgid "not a rev '%s'"
msgstr "rev '%s' nenhum"
-#: builtin/pack-objects.c:3368
+#: builtin/pack-objects.c:3631
#, fuzzy, c-format
msgid "bad revision '%s'"
msgstr "revisão '%s' incorreto"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3659
#, fuzzy
msgid "unable to add recent objects"
msgstr "incapaz adicionar objetos recentes"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3712
#, c-format
msgid "unsupported index version %s"
msgstr "versão de index %s insustentada"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3716
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:3488
+#: builtin/pack-objects.c:3755
#, fuzzy
msgid "<version>[,<offset>]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:3489
+#: builtin/pack-objects.c:3756
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3759
msgid "maximum size of each output pack file"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/pack-objects.c:3494
+#: builtin/pack-objects.c:3761
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
-#: builtin/pack-objects.c:3496
+#: builtin/pack-objects.c:3763
msgid "ignore packed objects"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3765
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:3500
+#: builtin/pack-objects.c:3767
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limitar a janela de compactação por memória em adição ao limite por objetos"
-#: builtin/pack-objects.c:3502
+#: builtin/pack-objects.c:3769
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
-#: builtin/pack-objects.c:3504
+#: builtin/pack-objects.c:3771
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:3506
+#: builtin/pack-objects.c:3773
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3508
+#: builtin/pack-objects.c:3775
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3510
+#: builtin/pack-objects.c:3777
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:3512
+#: builtin/pack-objects.c:3779
msgid "do not create an empty pack output"
msgstr "criar output de pack vazio nenhum"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3781
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:3516
+#: builtin/pack-objects.c:3783
msgid "limit the objects to those that are not yet packed"
msgstr "restringir-se aos objetos que ainda estão por compactar"
-#: builtin/pack-objects.c:3519
+#: builtin/pack-objects.c:3786
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:3522
+#: builtin/pack-objects.c:3789
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:3525
+#: builtin/pack-objects.c:3792
msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
-#: builtin/pack-objects.c:3528
+#: builtin/pack-objects.c:3795
+#, fuzzy
+msgid "read packs from stdin"
+msgstr "ler atualizações da entrada padrão"
+
+#: builtin/pack-objects.c:3797
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:3530
+#: builtin/pack-objects.c:3799
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refiram objetos a compactar"
-#: builtin/pack-objects.c:3532
+#: builtin/pack-objects.c:3801
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:3534
+#: builtin/pack-objects.c:3803
msgid "pack loose unreachable objects"
msgstr "empacotar objetos soltos inalcançáveis"
-#: builtin/pack-objects.c:3536
+#: builtin/pack-objects.c:3805
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <tempo>"
-#: builtin/pack-objects.c:3539
+#: builtin/pack-objects.c:3808
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3541
+#: builtin/pack-objects.c:3810
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:3543
+#: builtin/pack-objects.c:3812
msgid "create packs suitable for shallow fetches"
msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
-#: builtin/pack-objects.c:3545
+#: builtin/pack-objects.c:3814
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:3547
+#: builtin/pack-objects.c:3816
#, fuzzy
msgid "ignore this pack"
msgstr "usar pacote fino"
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c:3818
msgid "pack compression level"
msgstr "nível de compactação do pacote"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3820
msgid "do not hide commits by grafts"
msgstr "esconder commits por enxertos nenhuns"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3822
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar um índice de mapa de bits se disponível, para acelerar a contagem de "
"objetos"
-#: builtin/pack-objects.c:3555
+#: builtin/pack-objects.c:3824
msgid "write a bitmap index together with the pack index"
msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
-#: builtin/pack-objects.c:3559
+#: builtin/pack-objects.c:3828
#, fuzzy
msgid "write a bitmap index if possible"
msgstr "escrever índice de mapa de bits"
-#: builtin/pack-objects.c:3563
+#: builtin/pack-objects.c:3832
#, fuzzy
msgid "handling for missing objects"
msgstr "lidando para objetos que faltem"
-#: builtin/pack-objects.c:3566
+#: builtin/pack-objects.c:3835
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3837
#, fuzzy
msgid "respect islands during delta compression"
msgstr "dimensão da janela usada em compressão de deltas"
-#: builtin/pack-objects.c:3570
+#: builtin/pack-objects.c:3839
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:3571
+#: builtin/pack-objects.c:3840
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:3600
+#: builtin/pack-objects.c:3873
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3605
+#: builtin/pack-objects.c:3878
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3934
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3661
+#: builtin/pack-objects.c:3936
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3666
+#: builtin/pack-objects.c:3941
#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
msgstr "incapaz usar --thin para construir pack indexável"
-#: builtin/pack-objects.c:3669
+#: builtin/pack-objects.c:3944
#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable e -A são incompatíveis"
-#: builtin/pack-objects.c:3675
+#: builtin/pack-objects.c:3950
#, fuzzy
msgid "cannot use --filter without --stdout"
msgstr "usar --filter com --stdout"
-#: builtin/pack-objects.c:3735
+#: builtin/pack-objects.c:3952
+#, fuzzy
+msgid "cannot use --filter with --stdin-packs"
+msgstr "usar --filter com --stdout"
+
+#: builtin/pack-objects.c:3956
+#, fuzzy
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "incapaz especificar pathnames com --stdin"
+
+#: builtin/pack-objects.c:4015
#, fuzzy
msgid "Enumerating objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:3766
+#: builtin/pack-objects.c:4052
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
msgstr ""
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opções>]"
@@ -18546,11 +19334,11 @@ msgstr "Opções relativas a integração"
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar alterações por rebase em vez de integrar"
-#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir avanço rápido"
-#: builtin/pull.c:167 parse-options.h:339
+#: builtin/pull.c:167 parse-options.h:340
#, fuzzy
msgid "automatically stash/stash pop before and after"
msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
@@ -18572,37 +19360,18 @@ msgstr "número de submódulos com pull em paralelo"
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido de pull.ff: %s"
-#: builtin/pull.c:348
-msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
-"\n"
-" git config pull.rebase false # merge (the default strategy)\n"
-" git config pull.rebase true # rebase\n"
-" git config pull.ff only # fast-forward only\n"
-"\n"
-"You can replace \"git config\" with \"git config --global\" to set a "
-"default\n"
-"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
-"or --ff-only on the command line to override the configured default per\n"
-"invocation.\n"
-msgstr ""
-
-#: builtin/pull.c:458
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
-msgstr ""
-"As refs que obteste tem candidato nenhum para onde rebasear."
+msgstr "As refs que obteste tem candidato nenhum para onde rebasear."
-#: builtin/pull.c:460
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
-msgstr ""
-"As refs que obteste tem candidato nenhum para junção."
+msgstr "As refs que obteste tem candidato nenhum para junção."
-#: builtin/pull.c:461
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18610,7 +19379,7 @@ msgstr ""
"Normalmente isto significa que forneceste um wildcard especificador de ref\n"
"que tem correspondência nenhuma no lado do remoto."
-#: builtin/pull.c:464
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18621,43 +19390,43 @@ msgstr ""
"Visto que o remoto configurado como predefinido para o ramo atual é\n"
"outro, deves de especificar um ramo na linha de comandos."
-#: builtin/pull.c:469 builtin/rebase.c:1246
+#: builtin/pull.c:456 builtin/rebase.c:1248
msgid "You are not currently on a branch."
msgstr "Atualmente estás em ramo nenhum."
-#: builtin/pull.c:471 builtin/pull.c:486
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "Especifique o ramo sobre o qual pretende realizar rebase."
-#: builtin/pull.c:473 builtin/pull.c:488
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Especifique o ramo com o qual pretende integrar."
-#: builtin/pull.c:474 builtin/pull.c:489
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Consulte git-pull(1) para obter mais detalhes."
-#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
-#: builtin/rebase.c:1252
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<ramo>"
-#: builtin/pull.c:484 builtin/rebase.c:1244
+#: builtin/pull.c:471 builtin/rebase.c:1246
msgid "There is no tracking information for the current branch."
msgstr "O ramo atual tem informação de tracking nenhuma."
-#: builtin/pull.c:493
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
"com:"
-#: builtin/pull.c:498
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18666,28 +19435,45 @@ msgstr ""
"Tua configuração indica para juntar com ref '%s'\n"
"a partir do remoto, mas essa ref está por buscar."
-#: builtin/pull.c:609
+#: builtin/pull.c:596
#, fuzzy, c-format
msgid "unable to access commit %s"
msgstr "incapaz acessar commit %s"
-#: builtin/pull.c:915
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorado --verify-signatures para rebase"
-#: builtin/pull.c:972
+#: builtin/pull.c:930
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "Atualizando um ramo por nascer com alterações adicionadas ao índex."
-#: builtin/pull.c:976
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "pull com rebase"
-#: builtin/pull.c:977
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "submeta ou esconda-as."
-#: builtin/pull.c:1002
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18698,7 +19484,7 @@ msgstr ""
"a avançar a árvore de trabalho a partir do\n"
"commit %s."
-#: builtin/pull.c:1008
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18715,15 +19501,15 @@ msgstr ""
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:1023
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Incapaz de juntar ramos múltiplos para head vazia."
-#: builtin/pull.c:1027
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Incapaz de rebasear sobre ramos múltiplos."
-#: builtin/pull.c:1041
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -18818,8 +19604,7 @@ msgstr ""
#: builtin/push.c:260
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Indicou refspecs nenhum para atirar, e push.default é \"nothing\"."
+msgstr "Indicou refspecs nenhum para atirar, e push.default é \"nothing\"."
#: builtin/push.c:267
msgid ""
@@ -19029,48 +19814,54 @@ msgstr "--all e --mirror são incompatíveis"
msgid "push options must not have new line characters"
msgstr "opções de atiranço podem ter caracteres de nova linha nenhuns"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
#, fuzzy
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git merge [<opções>] [<commit>...]"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
#, fuzzy
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git mv [<opções>] <origem>... <destino>"
-#: builtin/range-diff.c:22
-msgid "Percentage by which creation is weighted"
-msgstr ""
-
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
#, fuzzy
msgid "use simple diff colors"
msgstr "usar a ferramenta diff especificada"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
#, fuzzy
msgid "notes"
msgstr "notes-ref"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "passed to 'git log'"
msgstr ""
-#: builtin/range-diff.c:50 builtin/range-diff.c:54
+#: builtin/range-diff.c:35
+#, fuzzy
+msgid "only emit output related to the first range"
+msgstr "mostrar apenas commits fora do primeiro ramo"
+
+#: builtin/range-diff.c:37
+#, fuzzy
+msgid "only emit output related to the second range"
+msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
#, fuzzy, c-format
-msgid "no .. in range: '%s'"
+msgid "not a commit range: '%s'"
msgstr "ramo inexistente: '%s'"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
#, fuzzy
msgid "need two commit ranges"
msgstr "editar a mensagem de commit"
@@ -19176,213 +19967,213 @@ msgstr ""
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
#, fuzzy, c-format
msgid "unusable todo list: '%s'"
msgstr "lista de tarefas inutilizável: '%s'"
-#: builtin/rebase.c:310
+#: builtin/rebase.c:311
#, fuzzy, c-format
msgid "could not create temporary %s"
msgstr "incapaz criar %s temporário"
-#: builtin/rebase.c:316
+#: builtin/rebase.c:317
#, fuzzy
msgid "could not mark as interactive"
msgstr "incapaz marcar como interativo"
-#: builtin/rebase.c:369
+#: builtin/rebase.c:370
#, fuzzy
msgid "could not generate todo list"
msgstr "incapaz gerar lista de tarefas"
-#: builtin/rebase.c:411
+#: builtin/rebase.c:412
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:480
+#: builtin/rebase.c:481
#, fuzzy
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--helper [<opções>]"
-#: builtin/rebase.c:493 builtin/rebase.c:1388
+#: builtin/rebase.c:494 builtin/rebase.c:1389
msgid "keep commits which start empty"
msgstr ""
-#: builtin/rebase.c:497 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "permitir commits com mensagens vazias"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:500
#, fuzzy
msgid "rebase merge commits"
msgstr "mergetag incorreta no commit '%s'"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:502
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase.c:503
+#: builtin/rebase.c:504
msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/rebase.c:504
+#: builtin/rebase.c:505
#, fuzzy
msgid "sign commits"
msgstr "assinar os commits com GPG"
-#: builtin/rebase.c:506 builtin/rebase.c:1327
+#: builtin/rebase.c:507 builtin/rebase.c:1328
msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:508
+#: builtin/rebase.c:509
msgid "continue rebase"
msgstr "continuar rebase"
-#: builtin/rebase.c:510
+#: builtin/rebase.c:511
#, fuzzy
msgid "skip commit"
msgstr "commit"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:512
#, fuzzy
msgid "edit the todo list"
msgstr "falha ao escrever para rev-list"
-#: builtin/rebase.c:513
+#: builtin/rebase.c:514
#, fuzzy
msgid "show the current patch"
msgstr "ignorar o patch atual"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:517
msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:518
+#: builtin/rebase.c:519
msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:520
+#: builtin/rebase.c:521
msgid "check the todo list"
msgstr ""
-#: builtin/rebase.c:522
+#: builtin/rebase.c:523
msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/rebase.c:524
+#: builtin/rebase.c:525
msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/rebase.c:525
+#: builtin/rebase.c:526
msgid "onto"
msgstr ""
-#: builtin/rebase.c:528
+#: builtin/rebase.c:529
#, fuzzy
msgid "restrict-revision"
msgstr "revisão"
-#: builtin/rebase.c:528
+#: builtin/rebase.c:529
#, fuzzy
msgid "restrict revision"
msgstr "revisão"
-#: builtin/rebase.c:530
+#: builtin/rebase.c:531
msgid "squash-onto"
msgstr ""
-#: builtin/rebase.c:531
+#: builtin/rebase.c:532
msgid "squash onto"
msgstr ""
-#: builtin/rebase.c:533
+#: builtin/rebase.c:534
#, fuzzy
msgid "the upstream commit"
msgstr "Remover a informação do ramo a montante"
-#: builtin/rebase.c:535
+#: builtin/rebase.c:536
#, fuzzy
msgid "head-name"
msgstr "mudar nome"
-#: builtin/rebase.c:535
+#: builtin/rebase.c:536
#, fuzzy
msgid "head name"
msgstr "à frente "
-#: builtin/rebase.c:540
+#: builtin/rebase.c:541
#, fuzzy
msgid "rebase strategy"
msgstr "estratégia de integração"
-#: builtin/rebase.c:541
+#: builtin/rebase.c:542
#, fuzzy
msgid "strategy-opts"
msgstr "estratégia"
-#: builtin/rebase.c:542
+#: builtin/rebase.c:543
#, fuzzy
msgid "strategy options"
msgstr "opções de decoração"
-#: builtin/rebase.c:543
+#: builtin/rebase.c:544
msgid "switch-to"
msgstr ""
-#: builtin/rebase.c:544
+#: builtin/rebase.c:545
msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase.c:545
+#: builtin/rebase.c:546
#, fuzzy
msgid "onto-name"
msgstr "nome"
-#: builtin/rebase.c:545
+#: builtin/rebase.c:546
#, fuzzy
msgid "onto name"
msgstr "nome do remoto"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:547
#, fuzzy
msgid "cmd"
msgstr "comando"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:547
#, fuzzy
msgid "the command to run"
msgstr "Nenhum comando concluído."
-#: builtin/rebase.c:549 builtin/rebase.c:1421
+#: builtin/rebase.c:550 builtin/rebase.c:1422
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/rebase.c:565
+#: builtin/rebase.c:566
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/rebase.c:581
+#: builtin/rebase.c:582
#, c-format
msgid "%s requires the merge backend"
msgstr ""
-#: builtin/rebase.c:624
+#: builtin/rebase.c:625
#, fuzzy, c-format
msgid "could not get 'onto': '%s'"
msgstr "incapaz obter 'onto': '%s'"
-#: builtin/rebase.c:641
+#: builtin/rebase.c:642
#, fuzzy, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválida: '%s'"
-#: builtin/rebase.c:666
+#: builtin/rebase.c:667
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
#, fuzzy
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
@@ -19396,7 +20187,7 @@ msgstr ""
"Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
"abort\"."
-#: builtin/rebase.c:894
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -19408,14 +20199,14 @@ msgid ""
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1220
+#: builtin/rebase.c:1222
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-#: builtin/rebase.c:1238
+#: builtin/rebase.c:1240
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -19432,7 +20223,7 @@ msgstr ""
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1254
+#: builtin/rebase.c:1256
#, fuzzy, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -19445,209 +20236,201 @@ msgstr ""
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1284
+#: builtin/rebase.c:1286
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1288
+#: builtin/rebase.c:1290
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1319
#, fuzzy
msgid "rebase onto given branch instead of upstream"
msgstr "demasiados ramos para remover a definição de ramo a montante"
-#: builtin/rebase.c:1320
+#: builtin/rebase.c:1321
#, fuzzy
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar a base de junção de upstream e ramo como base atual"
-#: builtin/rebase.c:1322
+#: builtin/rebase.c:1323
#, fuzzy
msgid "allow pre-rebase hook to run"
msgstr "Rebase recusado pelo hook pre-rebase."
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1325
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1330
+#: builtin/rebase.c:1331
#, fuzzy
msgid "do not show diffstat of what changed upstream"
msgstr "esconder diffstat de o que alterou upstream"
-#: builtin/rebase.c:1333
+#: builtin/rebase.c:1334
#, fuzzy
msgid "add a Signed-off-by trailer to each commit"
msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
-#: builtin/rebase.c:1336
+#: builtin/rebase.c:1337
#, fuzzy
msgid "make committer date match author date"
msgstr "agrupar por committer em vez de autor"
-#: builtin/rebase.c:1338
+#: builtin/rebase.c:1339
msgid "ignore author date and use current date"
msgstr ""
-#: builtin/rebase.c:1340
+#: builtin/rebase.c:1341
#, fuzzy
msgid "synonym of --reset-author-date"
msgstr "sinónimo de --files-with-matches"
-#: builtin/rebase.c:1342 builtin/rebase.c:1346
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
#, fuzzy
msgid "passed to 'git apply'"
msgstr "transmitir ao git-apply"
-#: builtin/rebase.c:1344
+#: builtin/rebase.c:1345
#, fuzzy
msgid "ignore changes in whitespace"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: builtin/rebase.c:1348 builtin/rebase.c:1351
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1353
+#: builtin/rebase.c:1354
#, fuzzy
msgid "continue"
msgstr "continuar rebase"
-#: builtin/rebase.c:1356
+#: builtin/rebase.c:1357
#, fuzzy
msgid "skip current patch and continue"
msgstr "ignorar o patch atual"
-#: builtin/rebase.c:1358
+#: builtin/rebase.c:1359
#, fuzzy
msgid "abort and check out the original branch"
msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
-#: builtin/rebase.c:1361
+#: builtin/rebase.c:1362
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1363
#, fuzzy
msgid "edit the todo list during an interactive rebase"
msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
-#: builtin/rebase.c:1365
+#: builtin/rebase.c:1366
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1369
msgid "use apply strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1372
+#: builtin/rebase.c:1373
#, fuzzy
msgid "use merging strategies to rebase"
msgstr "estratégia de integração a usar"
-#: builtin/rebase.c:1376
+#: builtin/rebase.c:1377
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1380
+#: builtin/rebase.c:1381
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1386
msgid "how to handle commits that become empty"
msgstr ""
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1393
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1399
+#: builtin/rebase.c:1400
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1404
#, fuzzy
msgid "allow rebasing commits with empty messages"
msgstr "permitir commits com mensagens vazias"
-#: builtin/rebase.c:1407
+#: builtin/rebase.c:1408
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1410
+#: builtin/rebase.c:1411
#, fuzzy
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "git merge-base --fork-point <referência> [<commit>]"
-#: builtin/rebase.c:1412
+#: builtin/rebase.c:1413
#, fuzzy
msgid "use the given merge strategy"
msgstr "opção de estratégia de integração"
-#: builtin/rebase.c:1414 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
msgid "option"
msgstr "opção"
-#: builtin/rebase.c:1415
+#: builtin/rebase.c:1416
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1419
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1423
+#: builtin/rebase.c:1424
msgid "apply all changes, even those already present upstream"
msgstr ""
-#: builtin/rebase.c:1440
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"o suporte a rebase.useBuiltin foi removido!\n"
-"Vê essa entry em 'git help config' para detalhes."
-
-#: builtin/rebase.c:1446
+#: builtin/rebase.c:1442
#, fuzzy
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está em curso. Incapaz de rebasear."
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1483
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1492
+#: builtin/rebase.c:1488
#, fuzzy
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "incapaz de combinar '--keep-base' com '--onto'"
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1490
#, fuzzy
msgid "cannot combine '--keep-base' with '--root'"
msgstr "incapaz de combinar '--keep-base' com '--root'"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1494
#, fuzzy
msgid "cannot combine '--root' with '--fork-point'"
msgstr "incapaz de combinar '--root' com '--fork-point'"
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1497
msgid "No rebase in progress?"
msgstr "Algum rebase em curso?"
-#: builtin/rebase.c:1505
+#: builtin/rebase.c:1501
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
-#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Incapaz ler HEAD"
-#: builtin/rebase.c:1540
+#: builtin/rebase.c:1536
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19655,17 +20438,17 @@ msgstr ""
"Deve editar todos os conflitos da integração\n"
"e marcá-los como resolvidos usando git add"
-#: builtin/rebase.c:1559
+#: builtin/rebase.c:1555
#, fuzzy
msgid "could not discard worktree changes"
msgstr "incapaz de descartar alterações de worktree"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1574
#, fuzzy, c-format
msgid "could not move back to %s"
msgstr "incapaz de retroceder a %s"
-#: builtin/rebase.c:1624
+#: builtin/rebase.c:1620
#, fuzzy, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19686,137 +20469,137 @@ msgstr ""
"e execute-me novamente. Estou parando caso ainda tenhas algo\n"
"de valor aí.\n"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1648
#, fuzzy
msgid "switch `C' expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1690
#, fuzzy, c-format
msgid "Unknown mode: %s"
msgstr "Mode de --patch desconhecido: %s"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1729
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1763
+#: builtin/rebase.c:1759
msgid "cannot combine apply options with merge options"
msgstr ""
-#: builtin/rebase.c:1776
+#: builtin/rebase.c:1772
#, fuzzy, c-format
msgid "Unknown rebase backend: %s"
msgstr "Subcomando desconhecido: %s"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1802
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1826
+#: builtin/rebase.c:1822
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1830
+#: builtin/rebase.c:1826
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1854
+#: builtin/rebase.c:1850
#, fuzzy, c-format
msgid "invalid upstream '%s'"
msgstr "caminho inválido '%s'"
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1856
#, fuzzy
msgid "Could not create new root commit"
msgstr "incapaz criar novo commit raiz"
-#: builtin/rebase.c:1886
+#: builtin/rebase.c:1882
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr ""
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:1885
#, fuzzy, c-format
msgid "'%s': need exactly one merge base"
msgstr "É necessário exatamente um intervalo."
-#: builtin/rebase.c:1897
+#: builtin/rebase.c:1893
#, fuzzy, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Aponta nada para commit válido '%s'"
-#: builtin/rebase.c:1923
+#: builtin/rebase.c:1921
#, fuzzy, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: nenhum ramo/commit '%s'"
-#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2415
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
-#: builtin/rebase.c:1942
+#: builtin/rebase.c:1940
#, fuzzy
msgid "Could not resolve HEAD to a revision"
msgstr "Foi impossível resolver HEAD para uma revisão"
-#: builtin/rebase.c:1963
+#: builtin/rebase.c:1961
msgid "Please commit or stash them."
msgstr "Submeta ou esconda-as."
-#: builtin/rebase.c:1999
+#: builtin/rebase.c:1997
#, fuzzy, c-format
msgid "could not switch to %s"
msgstr "incapaz alternar para %s"
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:2008
#, fuzzy
msgid "HEAD is up to date."
msgstr "HEAD está agora em"
-#: builtin/rebase.c:2012
+#: builtin/rebase.c:2010
#, fuzzy, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Branch atual %s está atualizado.\n"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:2018
#, fuzzy
msgid "HEAD is up to date, rebase forced."
msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
-#: builtin/rebase.c:2022
+#: builtin/rebase.c:2020
#, fuzzy, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Branch actual %s está atualizado, rebase forçado.\n"
-#: builtin/rebase.c:2030
+#: builtin/rebase.c:2028
msgid "The pre-rebase hook refused to rebase."
msgstr "Rebase recusado pelo hook pre-rebase."
-#: builtin/rebase.c:2037
+#: builtin/rebase.c:2035
#, fuzzy, c-format
msgid "Changes to %s:\n"
msgstr "Modificações para %s:\n"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2038
#, fuzzy, c-format
msgid "Changes from %s to %s:\n"
msgstr "Modificações de %s para %s:\n"
-#: builtin/rebase.c:2065
+#: builtin/rebase.c:2063
#, fuzzy, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n"
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2072
#, fuzzy
msgid "Could not detach HEAD"
msgstr "incapaz soltar HEAD"
-#: builtin/rebase.c:2083
+#: builtin/rebase.c:2081
#, fuzzy, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avançei-rápido %s para %s.\n"
@@ -19875,11 +20658,11 @@ msgstr ""
"\n"
"Para suprimir esta mensagem, podes definí-la como 'refuse'."
-#: builtin/receive-pack.c:2481
+#: builtin/receive-pack.c:2479
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:2495
+#: builtin/receive-pack.c:2493
msgid "You must specify a directory."
msgstr "Deve especificar um diretório."
@@ -19905,37 +20688,37 @@ msgstr ""
msgid "'%s' is not a valid timestamp"
msgstr "'%s' é um carimbo de data/hora inválido"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, fuzzy, c-format
msgid "Marking reachable objects..."
msgstr "manter objetos inalcançáveis"
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr ""
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
#, fuzzy
msgid "no reflog specified to delete"
msgstr "especificado reflog nenhum para apagar"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, fuzzy, c-format
msgid "not a reflog: %s"
msgstr "reflog inválido: %s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, fuzzy, c-format
msgid "no reflog for '%s'"
msgstr "reflog nenhum para '%s'"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, fuzzy, c-format
msgid "invalid ref format: %s"
msgstr "formato de ref inválido: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
@@ -20107,7 +20890,7 @@ msgid ""
"now names the non-existent remote '%s'"
msgstr ""
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
#, fuzzy, c-format
msgid "No such remote: '%s'"
msgstr "Remoto inexistente '%s'"
@@ -20124,8 +20907,7 @@ msgid ""
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"Deixando por atualizar refspec que é diferente de pré-definido"
-"\t%s\n"
+"Deixando por atualizar refspec que é diferente de pré-definido\t%s\n"
"\tPor favor, atualiza a configuração manualmente se necessário."
#: builtin/remote.c:770
@@ -20149,7 +20931,8 @@ msgstr[0] ""
"Nota: Um ramo fora da hierarquia refs/remotes/ está por remover;\n"
"para apagá-lo, usa:"
msgstr[1] ""
-"Nota: Alguns ramos fora da hierarquia refs/remotes/ estão por serem removidos;\n"
+"Nota: Alguns ramos fora da hierarquia refs/remotes/ estão por serem "
+"removidos;\n"
"para os apagá-los, usa:"
#: builtin/remote.c:896
@@ -20444,11 +21227,11 @@ msgstr "URL por encontrar: %s"
msgid "Will not delete all non-push URLs"
msgstr "Apagarei apenas alguns URLs de não-atirar"
-#: builtin/repack.c:25
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<opções>]"
-#: builtin/repack.c:30
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20456,121 +21239,145 @@ msgstr ""
"Repacks incrementais são incompatíveis com bitmap indexes. Usa\n"
"--no-write-bitmap-índex ou desative a configuração pack.writebitmaps."
-#: builtin/repack.c:197
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:268 builtin/repack.c:447
+#: builtin/repack.c:270 builtin/repack.c:630
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:295
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:323
+#: builtin/repack.c:309
+#, fuzzy, c-format
+msgid "cannot open index for %s"
+msgstr "incapaz opendir '%s'"
+
+#: builtin/repack.c:368
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr ""
+
+#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr ""
+
+#: builtin/repack.c:460
msgid "pack everything in a single pack"
msgstr "compactar tudo num único pacote"
-#: builtin/repack.c:325
+#: builtin/repack.c:462
msgid "same as -a, and turn unreachable objects loose"
msgstr "o mesmo que -a, e soltar objetos inalcançáveis"
-#: builtin/repack.c:328
+#: builtin/repack.c:465
msgid "remove redundant packs, and run git-prune-packed"
msgstr "remover pacotes redundantes e executar git-prune-packed"
-#: builtin/repack.c:330
+#: builtin/repack.c:467
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passar --no-reuse-delta ao git-pack-objects"
-#: builtin/repack.c:332
+#: builtin/repack.c:469
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passar --no-reuse-object ao git-pack-objects"
-#: builtin/repack.c:334
+#: builtin/repack.c:471
msgid "do not run git-update-server-info"
msgstr "executar git-update-server-info nenhum"
-#: builtin/repack.c:337
+#: builtin/repack.c:474
msgid "pass --local to git-pack-objects"
msgstr "passar --local para git-pack-objects"
-#: builtin/repack.c:339
+#: builtin/repack.c:476
msgid "write bitmap index"
msgstr "escrever índice de mapa de bits"
-#: builtin/repack.c:341
+#: builtin/repack.c:478
#, fuzzy
msgid "pass --delta-islands to git-pack-objects"
msgstr "passar --local ao git-pack-objects"
-#: builtin/repack.c:342
+#: builtin/repack.c:479
msgid "approxidate"
msgstr "aproximar"
-#: builtin/repack.c:343
+#: builtin/repack.c:480
msgid "with -A, do not loosen objects older than this"
msgstr "com -A, deixar de soltar objetos mais velhos que isto"
-#: builtin/repack.c:345
+#: builtin/repack.c:482
msgid "with -a, repack unreachable objects"
msgstr "com -a, reempacotar objetos inalcançáveis"
-#: builtin/repack.c:347
+#: builtin/repack.c:484
msgid "size of the window used for delta compression"
msgstr "dimensão da janela usada em compressão de deltas"
-#: builtin/repack.c:348 builtin/repack.c:354
+#: builtin/repack.c:485 builtin/repack.c:491
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:349
+#: builtin/repack.c:486
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"o mesmo que o anterior, mas limitar a memória usada em vez do número de "
"entradas"
-#: builtin/repack.c:351
+#: builtin/repack.c:488
msgid "limits the maximum delta depth"
msgstr "limitar a profundidade máxima de delta"
-#: builtin/repack.c:353
+#: builtin/repack.c:490
#, fuzzy
msgid "limits the maximum number of threads"
msgstr "limitar a profundidade máxima de delta"
-#: builtin/repack.c:355
+#: builtin/repack.c:492
msgid "maximum size of each packfile"
msgstr "tamanho máximo de cada ficheiro de pacote"
-#: builtin/repack.c:357
+#: builtin/repack.c:494
msgid "repack objects in packs marked with .keep"
msgstr "reempacotar objetos em pacotes marcados com .keep"
-#: builtin/repack.c:359
+#: builtin/repack.c:496
#, fuzzy
msgid "do not repack this pack"
msgstr "criar pacotes finos"
-#: builtin/repack.c:369
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
+
+#: builtin/repack.c:508
msgid "cannot delete packs in a precious-objects repo"
msgstr "incapaz apagar pacotes num repo de precious-objects"
-#: builtin/repack.c:373
+#: builtin/repack.c:512
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable e -A são incompatíveis"
-#: builtin/repack.c:456
+#: builtin/repack.c:527
+#, fuzzy
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--long é incompatível com --abbrev=0"
+
+#: builtin/repack.c:639
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:486
+#: builtin/repack.c:669
#, fuzzy, c-format
msgid "missing required file: %s"
msgstr "falta o objeto %s de %s"
-#: builtin/repack.c:488
+#: builtin/repack.c:671
#, fuzzy, c-format
msgid "could not unlink: %s"
msgstr "incapaz unlink: %s"
@@ -20914,8 +21721,8 @@ msgstr "HEAD está agora em %s"
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Incapaz de fazer uma reposição %s durante uma junção."
-#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
-#: builtin/stash.c:618
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
msgid "be quiet, only report errors"
msgstr "silencioso, só reportar erros"
@@ -20994,19 +21801,19 @@ msgstr "Incapaz repor ficheiro index para a revisão '%s'."
msgid "Could not write new index file."
msgstr "Incapaz escrever novo ficheiro index."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:538
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:599
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list insustenta mostrar notas"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:664
#, fuzzy
msgid "marked counting is incompatible with --objects"
msgstr "--first-parent é incompatível com --bisect"
@@ -21121,19 +21928,19 @@ msgstr "preservar commits inicialmente vazios"
msgid "keep redundant, empty commits"
msgstr "manter commits redundantes e vazios"
-#: builtin/revert.c:239
+#: builtin/revert.c:237
msgid "revert failed"
msgstr "falha ao reverter"
-#: builtin/revert.c:252
+#: builtin/revert.c:250
msgid "cherry-pick failed"
msgstr "falha ao efetuar cherry-pick"
-#: builtin/rm.c:19
+#: builtin/rm.c:20
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<opções>] [--] <ficheiro>..."
-#: builtin/rm.c:207
+#: builtin/rm.c:208
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -21147,7 +21954,7 @@ msgstr[1] ""
"os seguintes ficheiros têm staged content diferente quer no ficheiro\n"
"quer em HEAD:"
-#: builtin/rm.c:212
+#: builtin/rm.c:213
msgid ""
"\n"
"(use -f to force removal)"
@@ -21155,13 +21962,13 @@ msgstr ""
"\n"
"(usa -f para forçar remoção)"
-#: builtin/rm.c:216
+#: builtin/rm.c:217
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "o seguinte ficheiro contém alterações preparadas no índice:"
msgstr[1] "os seguintes ficheiros contêm alterações preparadas no índice:"
-#: builtin/rm.c:220 builtin/rm.c:229
+#: builtin/rm.c:221 builtin/rm.c:230
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -21169,48 +21976,48 @@ msgstr ""
"\n"
"(use --cached para manter o ficheiro, ou -f para forçar remoção)"
-#: builtin/rm.c:226
+#: builtin/rm.c:227
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "o seguinte ficheiro contém alterações locais:"
msgstr[1] "os seguintes ficheiros contêm alterações locais:"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "do not list removed files"
msgstr "listar ficheiros removidos nenhuns"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "only remove from the index"
msgstr "remover apenas do índice"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "override the up-to-date check"
msgstr "ignorar verificação de atualização"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "allow recursive removal"
msgstr "permitir remoção recursiva"
-#: builtin/rm.c:248
+#: builtin/rm.c:249
msgid "exit with a zero status even if nothing matched"
msgstr "sair com valor zero mesmo se nada corresponder"
-#: builtin/rm.c:282
+#: builtin/rm.c:283
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
-#: builtin/rm.c:305
+#: builtin/rm.c:310
#, fuzzy
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
-#: builtin/rm.c:323
+#: builtin/rm.c:331
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "removendo '%s' recursivamente apenas com -r"
-#: builtin/rm.c:362
+#: builtin/rm.c:379
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: incapaz remover %s"
@@ -21254,52 +22061,56 @@ msgstr ""
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git worktree list [<opções>]"
-#: builtin/shortlog.c:135
+#: builtin/shortlog.c:123
msgid "using multiple --group options with stdin is not supported"
msgstr ""
-#: builtin/shortlog.c:145
+#: builtin/shortlog.c:133
msgid "using --group=trailer with stdin is not supported"
msgstr ""
-#: builtin/shortlog.c:335
+#: builtin/shortlog.c:323
#, fuzzy, c-format
msgid "unknown group type: %s"
msgstr "Tipo desconhecido: %d"
-#: builtin/shortlog.c:363
-msgid "Group by committer rather than author"
+#: builtin/shortlog.c:351
+#, fuzzy
+msgid "group by committer rather than author"
msgstr "agrupar por committer em vez de autor"
-#: builtin/shortlog.c:366
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "ordenar saída de acordo com o número de commits por autor"
-#: builtin/shortlog.c:368
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+#, fuzzy
+msgid "suppress commit descriptions, only provides commit count"
msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits"
-#: builtin/shortlog.c:370
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+#, fuzzy
+msgid "show the email address of each author"
msgstr "Mostrar o endereço de e-mail de cada autor"
-#: builtin/shortlog.c:371
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
-#: builtin/shortlog.c:372
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+#, fuzzy
+msgid "linewrap output"
msgstr "ajustar linhas"
-#: builtin/shortlog.c:374
+#: builtin/shortlog.c:362
msgid "field"
msgstr ""
-#: builtin/shortlog.c:375
-msgid "Group by field"
+#: builtin/shortlog.c:363
+msgid "group by field"
msgstr ""
-#: builtin/shortlog.c:403
+#: builtin/shortlog.c:391
#, fuzzy
msgid "too many arguments given outside repository"
msgstr "%s: '%s' está fora do repositório"
@@ -21494,110 +22305,119 @@ msgstr "imprimir resultados nenhuns para stdout (útil com --verify)"
msgid "show refs from stdin that aren't in local repository"
msgstr "mostrar refs de stdin que estão fora do repositório local"
-#: builtin/sparse-checkout.c:21
+#: builtin/sparse-checkout.c:22
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr ""
-#: builtin/sparse-checkout.c:50
+#: builtin/sparse-checkout.c:46
#, fuzzy
msgid "git sparse-checkout list"
msgstr "git archive --list"
-#: builtin/sparse-checkout.c:76
+#: builtin/sparse-checkout.c:72
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:228
+#: builtin/sparse-checkout.c:227
#, fuzzy
msgid "failed to create directory for sparse-checkout file"
msgstr "falha ao criar o diretório %s"
-#: builtin/sparse-checkout.c:269
+#: builtin/sparse-checkout.c:268
msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
-#: builtin/sparse-checkout.c:271
+#: builtin/sparse-checkout.c:270
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:288
-msgid "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
msgstr ""
-#: builtin/sparse-checkout.c:307
+#: builtin/sparse-checkout.c:310
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:344
+#: builtin/sparse-checkout.c:312
+msgid "toggle the use of a sparse index"
+msgstr ""
+
+#: builtin/sparse-checkout.c:340
+#, fuzzy
+msgid "failed to modify sparse-index config"
+msgstr "falha ao ler o ficheiro de comando '%s'"
+
+#: builtin/sparse-checkout.c:361
#, c-format
msgid "failed to open '%s'"
msgstr "falha ao abrir '%s'"
-#: builtin/sparse-checkout.c:401
+#: builtin/sparse-checkout.c:419
#, fuzzy, c-format
msgid "could not normalize path %s"
msgstr "incapaz normalizar patch %s"
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:431
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:438
+#: builtin/sparse-checkout.c:456
#, fuzzy, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "incapaz de unquote string de C-style '%s'"
-#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
+#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:561
+#: builtin/sparse-checkout.c:579
#, fuzzy
msgid "read patterns from standard in"
msgstr "ler atualizações da entrada padrão"
-#: builtin/sparse-checkout.c:576
+#: builtin/sparse-checkout.c:594
msgid "git sparse-checkout reapply"
msgstr ""
-#: builtin/sparse-checkout.c:595
+#: builtin/sparse-checkout.c:613
#, fuzzy
msgid "git sparse-checkout disable"
msgstr "ignorar a aplicação do filtro de extração esparsa"
-#: builtin/sparse-checkout.c:623
+#: builtin/sparse-checkout.c:644
#, fuzzy
msgid "error while refreshing working directory"
msgstr "erro enquanto refrescava pasta de trabalho"
-#: builtin/stash.c:22 builtin/stash.c:38
+#: builtin/stash.c:24 builtin/stash.c:40
#, fuzzy
msgid "git stash list [<options>]"
msgstr "git worktree list [<opções>]"
-#: builtin/stash.c:23 builtin/stash.c:43
+#: builtin/stash.c:25 builtin/stash.c:45
#, fuzzy
msgid "git stash show [<options>] [<stash>]"
msgstr "git remote show [<opções>] <nome>"
-#: builtin/stash.c:24 builtin/stash.c:48
+#: builtin/stash.c:26 builtin/stash.c:50
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:25
+#: builtin/stash.c:27
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:26 builtin/stash.c:63
+#: builtin/stash.c:28 builtin/stash.c:65
#, fuzzy
msgid "git stash branch <branchname> [<stash>]"
msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
-#: builtin/stash.c:27 builtin/stash.c:68
+#: builtin/stash.c:29 builtin/stash.c:70
msgid "git stash clear"
msgstr ""
-#: builtin/stash.c:28
+#: builtin/stash.c:30
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21605,210 +22425,239 @@ msgid ""
" [--] [<pathspec>...]]"
msgstr ""
-#: builtin/stash.c:32 builtin/stash.c:85
+#: builtin/stash.c:34 builtin/stash.c:87
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
-#: builtin/stash.c:53
+#: builtin/stash.c:55
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:58
+#: builtin/stash.c:60
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/stash.c:73
+#: builtin/stash.c:75
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr ""
-#: builtin/stash.c:78
+#: builtin/stash.c:80
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"
msgstr ""
-#: builtin/stash.c:128
+#: builtin/stash.c:130
#, fuzzy, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' é commit tipo-arrumos nenhum"
-#: builtin/stash.c:148
+#: builtin/stash.c:150
#, fuzzy, c-format
msgid "Too many revisions specified:%s"
msgstr "Demasiadas revisões especificadas: $REV"
-#: builtin/stash.c:162
+#: builtin/stash.c:164
#, fuzzy
msgid "No stash entries found."
msgstr "Nenhuma pilha encontrada."
-#: builtin/stash.c:176
+#: builtin/stash.c:178
#, fuzzy, c-format
msgid "%s is not a valid reference"
msgstr "%s é referência inválida"
-#: builtin/stash.c:225
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:227
+#, fuzzy
+msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear com parâmetros está por implementar"
-#: builtin/stash.c:404
+#: builtin/stash.c:431
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+
+#: builtin/stash.c:492
#, fuzzy
msgid "cannot apply a stash in the middle of a merge"
msgstr "incapaz aplicar arrumação durante uma junção"
-#: builtin/stash.c:415
+#: builtin/stash.c:503
#, fuzzy, c-format
msgid "could not generate diff %s^!."
msgstr "incapaz gerar diff %s^!."
-#: builtin/stash.c:422
+#: builtin/stash.c:510
#, fuzzy
msgid "conflicts in index. Try without --index."
msgstr "Conflitos no index. Tenta sem --index."
-#: builtin/stash.c:428
+#: builtin/stash.c:516
#, fuzzy
msgid "could not save index tree"
msgstr "incapaz guardar árvore index"
-#: builtin/stash.c:437
+#: builtin/stash.c:525
#, fuzzy
msgid "could not restore untracked files from stash"
msgstr "incapaz restaurar ficheiros por seguir de arrumos"
-#: builtin/stash.c:451
+#: builtin/stash.c:539
#, fuzzy, c-format
msgid "Merging %s with %s"
msgstr "Juntando %s com %s"
-#: builtin/stash.c:461
+#: builtin/stash.c:549
msgid "Index was not unstashed."
msgstr "Index está por despreparar."
-#: builtin/stash.c:522 builtin/stash.c:620
+#: builtin/stash.c:591 builtin/stash.c:689
#, fuzzy
msgid "attempt to recreate the index"
msgstr "falha ao ler o índice"
-#: builtin/stash.c:566
+#: builtin/stash.c:635
#, fuzzy, c-format
msgid "Dropped %s (%s)"
msgstr "A descartar ${REV} ($s)"
-#: builtin/stash.c:569
+#: builtin/stash.c:638
#, fuzzy, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Incapaz descartar entrada de arrumos"
-#: builtin/stash.c:582
+#: builtin/stash.c:651
#, fuzzy, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' é referência de arrumos nenhuma"
-#: builtin/stash.c:632
+#: builtin/stash.c:701
#, fuzzy
msgid "The stash entry is kept in case you need it again."
msgstr "A pilha é guarda no caso de precisar dela de novo."
-#: builtin/stash.c:655
+#: builtin/stash.c:724
msgid "No branch name specified"
msgstr "Nenhum nome de ramo especificado"
-#: builtin/stash.c:799 builtin/stash.c:836
+#: builtin/stash.c:808
+#, fuzzy
+msgid "failed to parse tree"
+msgstr "falha a analisar %s"
+
+#: builtin/stash.c:819
+#, fuzzy
+msgid "failed to unpack trees"
+msgstr "falha ao descompactar o objeto árvore HEAD"
+
+#: builtin/stash.c:839
+#, fuzzy
+msgid "include untracked files in the stash"
+msgstr "incluir nos arrumos ficheiros por monitorizar"
+
+#: builtin/stash.c:842
+#, fuzzy
+msgid "only show untracked files in the stash"
+msgstr "incluir nos arrumos ficheiros por monitorizar"
+
+#: builtin/stash.c:932 builtin/stash.c:969
#, fuzzy, c-format
msgid "Cannot update %s with %s"
msgstr "Incapaz atualizar %s com %s"
-#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
#, fuzzy
msgid "stash message"
msgstr "mensagem da tag"
-#: builtin/stash.c:827
+#: builtin/stash.c:960
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1042
+#: builtin/stash.c:1175
msgid "No changes selected"
msgstr "Nenhuma alteração selecionada"
-#: builtin/stash.c:1142
+#: builtin/stash.c:1275
msgid "You do not have the initial commit yet"
msgstr "Commit inicial ainda é inexistente"
-#: builtin/stash.c:1169
+#: builtin/stash.c:1302
msgid "Cannot save the current index state"
msgstr "Incapaz guardar estado atual de index"
-#: builtin/stash.c:1178
+#: builtin/stash.c:1311
msgid "Cannot save the untracked files"
msgstr "Incapaz de guardar ficheiros por seguir"
-#: builtin/stash.c:1189 builtin/stash.c:1198
+#: builtin/stash.c:1322 builtin/stash.c:1331
msgid "Cannot save the current worktree state"
msgstr "Incapaz guardar o estado atual de worktree"
-#: builtin/stash.c:1226
+#: builtin/stash.c:1359
msgid "Cannot record working tree state"
msgstr "Incapaz gravar o estado de worktree"
-#: builtin/stash.c:1275
+#: builtin/stash.c:1408
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Impossível usar --patch e --include-untracked ou --all ao mesmo tempo"
-#: builtin/stash.c:1291
+#: builtin/stash.c:1426
#, fuzzy
msgid "Did you forget to 'git add'?"
msgstr "Será que falta 'git add'?"
-#: builtin/stash.c:1306
+#: builtin/stash.c:1441
msgid "No local changes to save"
msgstr "Com alterações locais para guardar nenhumas"
-#: builtin/stash.c:1313
+#: builtin/stash.c:1448
msgid "Cannot initialize stash"
msgstr "Incapaz inicializar arrumos"
-#: builtin/stash.c:1328
+#: builtin/stash.c:1463
msgid "Cannot save the current status"
msgstr "Incapaz guardar o estado atual"
-#: builtin/stash.c:1333
+#: builtin/stash.c:1468
#, fuzzy, c-format
msgid "Saved working directory and index state %s"
msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
-#: builtin/stash.c:1423
+#: builtin/stash.c:1558
msgid "Cannot remove worktree changes"
msgstr "Incapaz remover alterações de worktree"
-#: builtin/stash.c:1462 builtin/stash.c:1527
+#: builtin/stash.c:1597 builtin/stash.c:1662
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1464 builtin/stash.c:1529
+#: builtin/stash.c:1599 builtin/stash.c:1664
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1465 builtin/stash.c:1530
+#: builtin/stash.c:1600 builtin/stash.c:1665
#, fuzzy
msgid "quiet mode"
msgstr "modo silencioso"
-#: builtin/stash.c:1467 builtin/stash.c:1532
+#: builtin/stash.c:1602 builtin/stash.c:1667
#, fuzzy
msgid "include untracked files in stash"
msgstr "incluir nos arrumos ficheiros por monitorizar"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1604 builtin/stash.c:1669
#, fuzzy
msgid "include ignore files"
msgstr "mostrar ficheiros ignorados"
-#: builtin/stash.c:1569
+#: builtin/stash.c:1704
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -21831,7 +22680,7 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
@@ -21845,7 +22694,7 @@ msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr "incapaz despir um componente a partir do url '%s'"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
@@ -21853,25 +22702,25 @@ msgstr "âncora alternativa para caminhos relativos"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
+#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, fuzzy, c-format
msgid "Entering '%s'\n"
msgstr "Entrando em '%s'\n"
-#: builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:528
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:549
+#: builtin/submodule--helper.c:550
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -21879,21 +22728,22 @@ msgid ""
"."
msgstr ""
-#: builtin/submodule--helper.c:565
+#: builtin/submodule--helper.c:566
#, fuzzy
-msgid "Suppress output of entering each submodule command"
+msgid "suppress output of entering each submodule command"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:1488
#, fuzzy
-msgid "Recurse into nested submodules"
+msgid "recurse into nested submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/submodule--helper.c:572
+#: builtin/submodule--helper.c:573
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:600
#, fuzzy, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -21902,164 +22752,162 @@ msgstr ""
"incapaz encontrar configuração '%s'. Assumindo que este repositório é o "
"próprio repositório upstream autoritário."
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:667
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:671
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registado para path '%s'\n"
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:681
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "aviso: modo command update sugerido para submódulo '%s'\n"
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:688
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:709
-msgid "Suppress output for initializing a submodule"
+#: builtin/submodule--helper.c:710
+#, fuzzy
+msgid "suppress output for initializing a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:715
#, fuzzy
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
+msgstr ""
+"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:836
#, fuzzy, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
#, fuzzy, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
#, fuzzy
-msgid "Suppress submodule status output"
+msgid "suppress submodule status output"
msgstr "preceder isto ao caminho do submódulo"
-#: builtin/submodule--helper.c:887
-msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
-"HEAD"
-msgstr ""
-
#: builtin/submodule--helper.c:888
#, fuzzy
-msgid "recurse into nested submodules"
-msgstr "percorrer submódulos recursivamente"
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:894
#, fuzzy
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:918
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:993
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr ""
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:1006
#, fuzzy, c-format
msgid "%s"
msgstr "[%s]"
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1056
#, fuzzy, c-format
msgid "couldn't hash object from '%s'"
msgstr "incapaz fazer hash a objeto a partir de '%s'"
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1060
#, fuzzy, c-format
msgid "unexpected mode %o\n"
msgstr "modo inesperado %o\n"
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1301
#, fuzzy
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1303
msgid "to compare the commit in the index with that in the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1305
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1307
#, fuzzy
msgid "limit the summary size"
msgstr "restringir-se a cabeças"
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1312
#, fuzzy
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1336
#, fuzzy
msgid "could not fetch a revision for HEAD"
msgstr "incapaz buscar uma revisão para HEAD"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, fuzzy
msgid "--cached and --files are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1408
#, fuzzy, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url de submódulo para '%s'\n"
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1414
#, fuzzy, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1428
#, fuzzy, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1439
#, fuzzy, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1486
#, fuzzy
-msgid "Suppress output of synchronizing submodule url"
+msgid "suppress output of synchronizing submodule url"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1493
#, fuzzy
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1547
#, fuzzy, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22068,7 +22916,7 @@ msgstr ""
"Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo "
"removê-la e remover toda a história)"
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1559
#, fuzzy, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22077,46 +22925,46 @@ msgstr ""
"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
"use '-f' para as descartar"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1567
#, fuzzy, c-format
msgid "Cleared directory '%s'\n"
msgstr "Pasta '%s' limpa\n"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1569
#, fuzzy, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossível remover submodule work tree '%s'\n"
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1580
#, fuzzy, c-format
msgid "could not create empty submodule directory %s"
msgstr "incapaz criar pasta vazio de submódulo %s"
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1596
#, fuzzy, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n"
-#: builtin/submodule--helper.c:1624
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1625
+msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1626
#, fuzzy
-msgid "Unregister all submodules"
+msgid "unregister all submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1631
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1645
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1714
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -22124,47 +22972,47 @@ msgid ""
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' incapaz adicionar alternativo: %s"
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1792
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível"
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1799
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível"
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1823
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1826
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1829
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1837
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
msgid "force cloning progress"
msgstr "forçar progresso da clonagem"
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
#, fuzzy
msgid "disallow cloning into non-empty directory"
msgstr "a aplicar a um histórico vazio"
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1849
#, fuzzy
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
@@ -22174,105 +23022,106 @@ msgstr ""
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1874
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1884
+#: builtin/submodule--helper.c:1885
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1888
+#: builtin/submodule--helper.c:1889
#, fuzzy, c-format
msgid "directory not empty: '%s'"
msgstr "pasta com conteúdo: '%s'"
-#: builtin/submodule--helper.c:1900
+#: builtin/submodule--helper.c:1901
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "incapaz obter pasta de submódulo para '%s'"
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1937
#, fuzzy, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1941
#, fuzzy, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2042
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Path de submódulo '%s' por inicializar"
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2046
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendias usar 'update --init'?"
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2076
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Passando à frente submódulo por juntar %s"
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2105
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Passando à frente submódulo '%s'"
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2255
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2266
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
msgid "path into the working tree"
msgstr "caminho para a árvore de trabalho"
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2331
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"caminho para a árvore de trabalho, atravessando limites de submódulos "
"aninhados"
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2335
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:2340
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2341
+#, fuzzy
+msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "criar um clone raso, truncado ao número especificado de revisões"
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2344
msgid "parallel jobs"
msgstr "trabalhos em paralelo"
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2346
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "se o clone inicial deve seguir a recomendação rasa"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2347
msgid "don't print cloning progress"
msgstr "imprimir progresso da clonagem nenhum"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2358
#, fuzzy
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2371
msgid "bad value for update parameter"
msgstr "valor incorreto no parâmetro update"
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2419
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22281,97 +23130,97 @@ msgstr ""
"Ramo de submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
"mas o superprojeto está em ramo nenhum"
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2542
#, fuzzy, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "incapaz obter pega de repositório para submódulo '%s'"
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2575
msgid "recurse into submodules"
msgstr "percorrer recursivamente submódulos"
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2581
#, fuzzy
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<caminho>...]"
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2637
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2640
#, fuzzy
msgid "unset the config in the .gitmodules file"
msgstr "falha ao preparar .gitmodules atualizado"
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2645
#, fuzzy
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2646
#, fuzzy
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2647
#, fuzzy
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
+#: builtin/submodule--helper.c:2666 git-submodule.sh:150
#, fuzzy, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2682
#, fuzzy
-msgid "Suppress output for setting url of a submodule"
+msgid "suppress output for setting url of a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2686
#, fuzzy
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2719
#, fuzzy
msgid "set the default tracking branch to master"
msgstr "mostrar os ramos de monitorização remotos"
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2721
#, fuzzy
msgid "set the default tracking branch"
msgstr "mostrar os ramos de monitorização remotos"
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2725
#, fuzzy
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2726
#, fuzzy
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2733
#, fuzzy
msgid "--branch or --default required"
msgstr "nome do ramo é obrigatório"
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2736
#, fuzzy
msgid "--branch and --default are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/submodule--helper.c:2792 git.c:438 git.c:711
+#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s insustenta --super-prefix"
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:2799
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' é subcomando inválido de submodule--helper"
@@ -22384,23 +23233,23 @@ msgstr "git symbolic-ref [<opções>] <nome> [<referência>]"
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nome>"
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "suprimir mensagens de erro sobre refs não-simbólicas (destacadas)"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
msgid "delete symbolic ref"
msgstr "apagar ref simbólica"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
msgid "shorten ref output"
msgstr "encurtar output de ref"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
msgid "reason"
msgstr "razão"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "razão da atualização"
@@ -22434,17 +23283,17 @@ msgstr ""
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<formato>] <nometag>..."
-#: builtin/tag.c:89
+#: builtin/tag.c:100
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' por encontrar."
-#: builtin/tag.c:105
+#: builtin/tag.c:135
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Apaguei tag '%s' (era %s)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:170
#, c-format
msgid ""
"\n"
@@ -22457,7 +23306,7 @@ msgstr ""
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:174
#, c-format
msgid ""
"\n"
@@ -22471,15 +23320,11 @@ msgstr ""
" %s\n"
"Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:241
msgid "unable to sign the tag"
msgstr "incapaz assinar a tag"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "incapaz escrever ficheiro de tag"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:259
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -22488,144 +23333,140 @@ msgid ""
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:232
+#: builtin/tag.c:275
msgid "bad object type."
msgstr "tipo de objeto incorreto."
-#: builtin/tag.c:285
+#: builtin/tag.c:328
msgid "no tag message?"
msgstr "sem mensagem de tag?"
-#: builtin/tag.c:292
+#: builtin/tag.c:335
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Deixei a mensagem da tag em %s\n"
-#: builtin/tag.c:403
+#: builtin/tag.c:446
msgid "list tag names"
msgstr "listar os nomes das tag"
-#: builtin/tag.c:405
+#: builtin/tag.c:448
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> linhas de cada mensagem de tag"
-#: builtin/tag.c:407
+#: builtin/tag.c:450
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:408
+#: builtin/tag.c:451
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:410
+#: builtin/tag.c:453
msgid "Tag creation options"
msgstr "Opções de criação de tags"
-#: builtin/tag.c:412
+#: builtin/tag.c:455
msgid "annotated tag, needs a message"
msgstr "tag anotada, é necessário uma mensagem"
-#: builtin/tag.c:414
+#: builtin/tag.c:457
msgid "tag message"
msgstr "mensagem da tag"
-#: builtin/tag.c:416
+#: builtin/tag.c:459
#, fuzzy
msgid "force edit of tag message"
msgstr "forçar edição do commit"
-#: builtin/tag.c:417
+#: builtin/tag.c:460
msgid "annotated and GPG-signed tag"
msgstr "tag anotada e assinada com GPG"
-#: builtin/tag.c:420
+#: builtin/tag.c:463
msgid "use another key to sign the tag"
msgstr "usar outra chave para assinar a tag"
-#: builtin/tag.c:421
+#: builtin/tag.c:464
msgid "replace the tag if exists"
msgstr "substituir a tag se esta existir"
-#: builtin/tag.c:422 builtin/update-ref.c:505
+#: builtin/tag.c:465 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "criar um reflog"
-#: builtin/tag.c:424
+#: builtin/tag.c:467
msgid "Tag listing options"
msgstr "Opções de listagem de tags"
-#: builtin/tag.c:425
+#: builtin/tag.c:468
msgid "show tag list in columns"
msgstr "mostrar a lista de tags em colunas"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that contain the commit"
msgstr "imprimir apenas tags que contenham o commit"
-#: builtin/tag.c:427 builtin/tag.c:429
+#: builtin/tag.c:470 builtin/tag.c:472
msgid "print only tags that don't contain the commit"
msgstr "imprimir apenas tags a que falte o commit"
-#: builtin/tag.c:430
+#: builtin/tag.c:473
msgid "print only tags that are merged"
msgstr "imprimir apenas as tags que foram integradas"
-#: builtin/tag.c:431
+#: builtin/tag.c:474
msgid "print only tags that are not merged"
msgstr "imprimir apenas as tags que estão por juntar"
-#: builtin/tag.c:435
+#: builtin/tag.c:478
msgid "print only tags of the object"
msgstr "imprimir apenas as tags do objeto"
-#: builtin/tag.c:483
+#: builtin/tag.c:526
msgid "--column and -n are incompatible"
msgstr "--column e -n são incompatíveis"
-#: builtin/tag.c:505
+#: builtin/tag.c:548
msgid "-n option is only allowed in list mode"
msgstr "a opção -n só é permitida no modo lista"
-#: builtin/tag.c:507
+#: builtin/tag.c:550
msgid "--contains option is only allowed in list mode"
msgstr "a opção --contains só é permitida no modo lista"
-#: builtin/tag.c:509
+#: builtin/tag.c:552
msgid "--no-contains option is only allowed in list mode"
msgstr "a opção --contains só é permitida no modo lista"
-#: builtin/tag.c:511
+#: builtin/tag.c:554
msgid "--points-at option is only allowed in list mode"
msgstr "a opção --points-at só é permitida no modo lista"
-#: builtin/tag.c:513
+#: builtin/tag.c:556
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "as opções --merged e --no-merged só são permitidas no modo lista"
-#: builtin/tag.c:524
+#: builtin/tag.c:567
msgid "only one -F or -m option is allowed."
msgstr "só é permitido um opção -F ou -m."
-#: builtin/tag.c:543
-msgid "too many params"
-msgstr "demasiado parâmetros"
-
-#: builtin/tag.c:549
+#: builtin/tag.c:592
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' é nome de tag inválido."
-#: builtin/tag.c:554
+#: builtin/tag.c:597
#, c-format
msgid "tag '%s' already exists"
msgstr "a tag '%s' já existe"
-#: builtin/tag.c:585
+#: builtin/tag.c:628
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Atualizei tag '%s' (era %s)\n"
-#: builtin/unpack-objects.c:502
+#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "A descompactar objetos"
@@ -22656,7 +23497,8 @@ msgstr "Testando mtime em '%s' "
#: builtin/update-index.c:154
msgid "directory stat info does not change after adding a new file"
-msgstr "info de stat da pasta mantêm-se inalterada após adicionar novo ficheiro"
+msgstr ""
+"info de stat da pasta mantêm-se inalterada após adicionar novo ficheiro"
#: builtin/update-index.c:167
msgid "directory stat info does not change after adding a new directory"
@@ -22686,147 +23528,148 @@ msgstr " OK"
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:976
msgid "continue refresh even when index needs update"
msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:979
msgid "refresh: ignore submodules"
msgstr "refrescar: ignorar submódulos"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:982
msgid "do not ignore new files"
msgstr "considera novos ficheiros"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:984
msgid "let files replace directories and vice-versa"
msgstr "deixar que os ficheiros substituam os diretórios e vice-versa"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:986
msgid "notice files missing from worktree"
msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:988
msgid "refresh even if index contains unmerged entries"
msgstr "refrescar mesmo se índex contenha entradas por juntar"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:991
msgid "refresh stat information"
msgstr "refrescar informação de stat"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:995
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "como --refresh, mas ignorar a definição assume-unchanged"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:999
msgid "<mode>,<object>,<path>"
msgstr "<modo>,<objeto>,<caminho>"
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1000
msgid "add the specified entry to the index"
msgstr "adicionar o elemento especificado ao índice"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "mark files as \"not changing\""
msgstr "marcar ficheiros como \"não alterar\""
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1013
msgid "clear assumed-unchanged bit"
msgstr "limpar o bit assumed-unchanged"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1016
msgid "mark files as \"index-only\""
msgstr "marcar ficheiros como \"únicos do índice\""
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1019
msgid "clear skip-worktree bit"
msgstr "limpar o bit ignorar-árvore-de-trabalho"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1022
msgid "do not touch index-only entries"
msgstr ""
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1024
msgid "add to index only; do not add content to object database"
-msgstr "adiciona