summaryrefslogtreecommitdiff
path: root/po/pt_PT.po
diff options
context:
space:
mode:
authorDaniel Santos <hello@brighterdan.com>2021-08-03 12:30:05 (GMT)
committerDaniel Santos <hello@brighterdan.com>2021-08-05 13:05:11 (GMT)
commit01758866ba956d60420077372a1ece93200211f4 (patch)
tree3f5a73e57f94bfd488eda5f44eecdb775dff9278 /po/pt_PT.po
parentcece123d7129d4f144533a1d08945b1b3de2149c (diff)
downloadgit-01758866ba956d60420077372a1ece93200211f4.zip
git-01758866ba956d60420077372a1ece93200211f4.tar.gz
git-01758866ba956d60420077372a1ece93200211f4.tar.bz2
l10n: pt_PT: update git-po-helper
Signed-off-by: Daniel Santos <hello@brighterdan.com>
Diffstat (limited to 'po/pt_PT.po')
-rw-r--r--po/pt_PT.po4037
1 files changed, 2090 insertions, 1947 deletions
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 83fb92b..93b4ed3 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -161,7 +161,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
+"POT-Creation-Date: 2021-08-03 17:06+0800\n"
"PO-Revision-Date: 2020-10-14 11:43+0100\n"
"Last-Translator: Daniel Santos <hello@brighterdan.com>\n"
"Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"
@@ -177,7 +177,7 @@ msgid "Huh (%s)?"
msgstr "O quê (%s)?"
#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
+#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
#: builtin/rebase.c:1953
msgid "could not read index"
msgstr "incapaz de ler index"
@@ -206,7 +206,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:3687
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
#, fuzzy
msgid "could not write index"
msgstr "incapaz de escrever index"
@@ -266,12 +266,12 @@ msgstr[1] "adicionei %d paths\n"
msgid "ignoring unmerged: %s"
msgstr "ignorando unmerged: %s"
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Apenas ficheiros binários mudaram.\n"
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Sem modificação.\n"
@@ -357,11 +357,11 @@ msgstr "seleciona item numerado"
msgid "(empty) select nothing"
msgstr "(vazio) seleciona nada"
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
msgid "What now"
msgstr "E agora"
@@ -373,12 +373,12 @@ msgstr "staged"
msgid "unstaged"
msgstr "unstaged"
-#: 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
+#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c: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
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
+#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
+#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
#: git-add--interactive.perl:213
msgid "path"
msgstr "path"
@@ -388,7 +388,7 @@ msgstr "path"
msgid "could not refresh index"
msgstr "incapaz de reactualizar o index"
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Adeus.\n"
@@ -703,36 +703,36 @@ msgstr ""
"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
-#: add-patch.c:342
+#: add-patch.c:343
#, fuzzy, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "incapaz de analisar início de pedaço '%s'"
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
#, fuzzy, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "incapaz de analisar início de pedaço colorido '%.*s'"
-#: add-patch.c:419
+#: add-patch.c:420
#, fuzzy
msgid "could not parse diff"
msgstr "incapaz de analisar diff"
-#: add-patch.c:438
+#: add-patch.c:439
#, fuzzy
msgid "could not parse colored diff"
msgstr "incapaz de analisar diff colorido"
-#: add-patch.c:452
+#: add-patch.c:453
#, fuzzy, c-format
msgid "failed to run '%s'"
msgstr "falha ao executar '%s'"
-#: add-patch.c:611
+#: add-patch.c:612
msgid "mismatched output from interactive.diffFilter"
msgstr "sem match de output de interactive.diffFilter"
-#: add-patch.c:612
+#: add-patch.c:613
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -740,7 +740,7 @@ msgstr ""
"O teu filtro tem de manter uma correspondência exata\n"
"entre seu input e linhas output."
-#: add-patch.c:790
+#: add-patch.c:791
#, fuzzy, c-format
msgid ""
"expected context line #%d in\n"
@@ -749,7 +749,7 @@ msgstr ""
"linha de contexto esperada #%d em\n"
"%.*s"
-#: add-patch.c:805
+#: add-patch.c:806
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -762,11 +762,11 @@ msgstr ""
"\ttermina sem:\n"
"%.*s"
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n"
-#: add-patch.c:1085
+#: add-patch.c:1086
#, fuzzy, c-format
msgid ""
"---\n"
@@ -780,7 +780,7 @@ msgstr ""
"Linhas começadas com %c serão removidas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -790,12 +790,12 @@ msgstr ""
"editar. Se todas as linhas deste pedaço forem removidas, então a edição\n"
"é abortada e este pedaço é deixado inalterado.\n"
-#: add-patch.c:1132
+#: add-patch.c:1133
#, fuzzy
msgid "could not parse hunk header"
msgstr "incapaz interpretar início de pedaço"
-#: add-patch.c:1177
+#: add-patch.c:1178
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' falhou"
@@ -811,27 +811,27 @@ msgstr "'git apply --cached' falhou"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Problema na submissão de pedaço editado. Editar de novo (responder \"n\" "
"para \"não\" descarta!) [y/n]? "
-#: add-patch.c:1289
+#: add-patch.c:1290
#, fuzzy
msgid "The selected hunks do not apply to the index!"
msgstr "Submissão incorreta de pedaços selecionados para index!"
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Submetê-los para worktree mesmo assim? "
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Nada foi submetido.\n"
-#: add-patch.c:1354
+#: add-patch.c:1355
#, fuzzy
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
@@ -854,72 +854,72 @@ msgstr ""
"e - editar manualmente o pedaço atual\n"
"? - mostrar ajuda\n"
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
#, fuzzy
msgid "No previous hunk"
msgstr "Sem pedaço anterior"
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
#, fuzzy
msgid "No next hunk"
msgstr "Sem próximo pedaço"
-#: add-patch.c:1537
+#: add-patch.c:1538
msgid "No other hunks to goto"
msgstr "Sem qualquer outro pedaço"
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "ir para qual pedaço (<ret> para ver mais)? "
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "ir para qual pedaço? "
-#: add-patch.c:1560
+#: add-patch.c:1561
#, fuzzy, c-format
msgid "Invalid number: '%s'"
msgstr "Número inválido: '%s'"
-#: add-patch.c:1565
+#: add-patch.c:1566
#, fuzzy, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Lamento, apenas %d pedaço disponível."
msgstr[1] "Lamento, apenas %d pedaços disponíveis."
-#: add-patch.c:1574
+#: add-patch.c:1575
msgid "No other hunks to search"
msgstr "Sem outro pedaço a procurar"
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "procurar por regex? "
-#: add-patch.c:1595
+#: add-patch.c:1596
#, fuzzy, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Pesquisa regexp deformada %s: %s"
-#: add-patch.c:1612
+#: add-patch.c:1613
#, fuzzy
msgid "No hunk matches the given pattern"
msgstr "Sem pedaço correspondente ao padrão fornecido"
-#: add-patch.c:1619
+#: add-patch.c:1620
msgid "Sorry, cannot split this hunk"
msgstr "Lamento, incapaz de dividir este pedaço"
-#: add-patch.c:1623
+#: add-patch.c:1624
#, fuzzy, c-format
msgid "Split into %d hunks."
msgstr "Dividir em %d pedaços."
-#: add-patch.c:1627
+#: add-patch.c:1628
msgid "Sorry, cannot edit this hunk"
msgstr "Lamento, incapaz de editar este pedaço"
-#: add-patch.c:1679
+#: add-patch.c:1680
#, fuzzy
msgid "'git apply' failed"
msgstr "'git apply' falhou"
@@ -1363,8 +1363,8 @@ msgstr "%s: tipo errado"
msgid "%s has type %o, expected %o"
msgstr "%s é do tipo %o, esperado %o"
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
+#: read-cache.c:1353
#, c-format
msgid "invalid path '%s'"
msgstr "caminho inválido '%s'"
@@ -1454,7 +1454,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:523
+#: apply.c:4376 builtin/bisect--helper.c:525
#, c-format
msgid "failed to write to '%s'"
msgstr "falha a escrever para '%s'"
@@ -1544,7 +1544,7 @@ 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
msgid "Unable to write new index file"
msgstr "Incapaz de escrever novo ficheiro index"
@@ -1557,7 +1557,7 @@ msgstr ""
msgid "apply changes matching the given path"
msgstr "submeter alterações correspondentes a path fornecido"
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5000 builtin/am.c:2318
msgid "num"
msgstr "num"
@@ -1623,9 +1623,9 @@ msgstr "os caminhos estão separados por caracteres NUL"
msgid "ensure at least <n> lines of context match"
msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
#: builtin/rebase.c:1347
msgid "action"
msgstr "ação"
@@ -1655,8 +1655,8 @@ msgid "allow overlapping hunks"
msgstr "permitir a sobreposição de pedaços"
#: 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
+#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
@@ -1669,7 +1669,7 @@ msgstr ""
msgid "do not trust the line counts in the hunk headers"
msgstr "desconfia da contagem de linhas nos headers de pedaços"
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5059 builtin/am.c:2306
msgid "root"
msgstr "raiz"
@@ -1712,7 +1712,7 @@ msgstr ""
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
#, c-format
msgid "deflate error (%d)"
msgstr "erro ao compactar (%d)"
@@ -1747,13 +1747,13 @@ msgid "cannot read %s"
msgstr "incapaz ler '%s'"
#: 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
+#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
#: builtin/merge.c:1143
#, c-format
msgid "could not read '%s'"
msgstr "incapaz ler '%s'"
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"
@@ -1796,7 +1796,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "formato do arquivo"
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:553 builtin/log.c:1775
msgid "prefix"
msgstr "prefixo"
@@ -1807,7 +1807,7 @@ msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
#: 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/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
msgid "file"
@@ -1840,7 +1840,7 @@ msgid "list supported archive formats"
msgstr "listar formatos de arquivo suportados"
#: 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
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
msgid "repo"
msgstr "repo"
@@ -1848,7 +1848,7 @@ msgstr "repo"
msgid "retrieve the archive from remote repository <repo>"
msgstr "obter o arquivo a partir do repositório remoto <repo>"
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
#: builtin/notes.c:498
msgid "command"
msgstr "comando"
@@ -2034,11 +2034,11 @@ 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: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
+#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
+#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
+#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
+#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
+#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "falha ao configurar percurso de revisões"
@@ -2196,120 +2196,120 @@ msgstr "'%s' foi já extraído em '%s'"
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD da working tree %s está desatualizada"
-#: bundle.c:41
+#: bundle.c:44
#, fuzzy, c-format
msgid "unrecognized bundle hash algorithm: %s"
msgstr "algoritmo hash de bundle irreconhecível: %s"
-#: bundle.c:45
+#: bundle.c:48
#, fuzzy, c-format
msgid "unknown capability '%s'"
msgstr "capacidade desconhecida '%s'"
-#: bundle.c:71
+#: bundle.c:74
#, fuzzy, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"
-#: bundle.c:110
+#: bundle.c:113
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "cabeçalho irreconhecível: %s%s (%d)"
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
#: builtin/commit.c:861
#, c-format
msgid "could not open '%s'"
msgstr "incapaz abrir '%s'"
-#: bundle.c:189
+#: bundle.c:198
msgid "Repository lacks these prerequisite commits:"
msgstr "Falta ao repositório estes pré-requisitos de commits:"
-#: bundle.c:192
+#: bundle.c:201
#, fuzzy
msgid "need a repository to verify a bundle"
msgstr "é preciso repositório para verificar um bundle."
-#: bundle.c:243
+#: bundle.c:257
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "O bundle contém esta referência:"
msgstr[1] "O bundle contém estas %d referências:"
-#: bundle.c:250
+#: bundle.c:264
msgid "The bundle records a complete history."
msgstr "O pacote regista um histórico completo."
-#: bundle.c:252
+#: bundle.c:266
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "O bundle requer esta referência:"
msgstr[1] "O bundle requer estas %d referências:"
-#: bundle.c:319
+#: bundle.c:333
#, fuzzy
msgid "unable to dup bundle descriptor"
msgstr "incapaz de dup descritor de bundle"
-#: bundle.c:326
+#: bundle.c:340
msgid "Could not spawn pack-objects"
msgstr "Impossível gerar pack-objects"
-#: bundle.c:337
+#: bundle.c:351
msgid "pack-objects died"
msgstr "pack-objects terminaram inesperadamente"
-#: bundle.c:386
+#: bundle.c:400
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "a referência '%s' é excluída pelas opções de rev-list"
-#: bundle.c:490
+#: bundle.c:504
#, fuzzy, c-format
msgid "unsupported bundle version %d"
msgstr "fora de suporte versão bundle %d"
-#: bundle.c:492
+#: bundle.c:506
#, c-format
msgid "cannot write bundle version %d with algorithm %s"
msgstr ""
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento irreconhecível: %s"
-#: bundle.c:539
+#: bundle.c:553
msgid "Refusing to create empty bundle."
msgstr "Criação de bundle vazio recusada."
-#: bundle.c:549
+#: bundle.c:563
#, c-format
msgid "cannot create '%s'"
msgstr "incapaz criar '%s'"
-#: bundle.c:574
+#: bundle.c:588
msgid "index-pack died"
msgstr "index-pack terminou inesperadamente"
-#: chunk-format.c:113
+#: chunk-format.c:117
msgid "terminating chunk id appears earlier than expected"
msgstr ""
-#: chunk-format.c:122
+#: chunk-format.c:126
#, c-format
msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
msgstr ""
-#: chunk-format.c:129
+#: chunk-format.c:133
#, c-format
msgid "duplicate chunk ID %<PRIx32> found"
msgstr ""
-#: chunk-format.c:143
+#: chunk-format.c:147
#, c-format
msgid "final chunk has non-zero id %<PRIx32>"
msgstr ""
@@ -2379,12 +2379,12 @@ msgstr "incapaz encontrar commit %s"
msgid "commit-graph requires overflow generation data but has none"
msgstr ""
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1075 builtin/am.c:1341
#, c-format
msgid "unable to parse commit %s"
msgstr "incapaz analisar commit %s"
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
#, fuzzy, c-format
msgid "unable to get type of object %s"
msgstr "incapaz obter tipo de objeto %s"
@@ -2448,7 +2448,7 @@ msgstr ""
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1812 midx.c:911
#, fuzzy, c-format
msgid "unable to create leading directories of %s"
msgstr "incapaz criar as pastas superiores a %s"
@@ -2503,78 +2503,78 @@ msgstr ""
msgid "too many commits to write graph"
msgstr "demasiados commits para escrever grafo"
-#: commit-graph.c:2450
+#: commit-graph.c:2449
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2460
+#: commit-graph.c:2459
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2470 commit-graph.c:2485
+#: commit-graph.c:2469 commit-graph.c:2484
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2477
+#: commit-graph.c:2476
#, fuzzy, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "incapaz analisar commit %s de commit-graph"
-#: commit-graph.c:2495
+#: commit-graph.c:2494
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2510
+#: commit-graph.c:2509
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2517
+#: commit-graph.c:2516
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2527
+#: commit-graph.c:2526
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2536
+#: commit-graph.c:2535
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2550
+#: commit-graph.c:2549
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2555
+#: commit-graph.c:2554
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2559
+#: commit-graph.c:2558
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2576
+#: commit-graph.c:2575
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr ""
-#: commit-graph.c:2582
+#: commit-graph.c:2581
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: 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
+#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
+#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "incapaz analisar %s"
@@ -2852,7 +2852,7 @@ msgstr "valor inválido de %s: %s"
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1687 builtin/pack-objects.c:4084
#, c-format
msgid "bad pack compression level %d"
msgstr "nível de compactação do pacote %d incorreto"
@@ -2872,111 +2872,111 @@ msgstr "referência '%s' aponta para blob nenhum"
msgid "unable to resolve config blob '%s'"
msgstr "incapaz resolver blog config '%s'"
-#: config.c:1873
+#: config.c:1874
#, fuzzy, c-format
msgid "failed to parse %s"
msgstr "falha a analisar %s"
-#: config.c:1929
+#: config.c:1930
msgid "unable to parse command-line config"
msgstr "incapaz analisar config de linha de comandos"
-#: config.c:2293
+#: config.c:2294
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
-#: config.c:2467
+#: config.c:2468
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Inválido %s: '%s'"
-#: config.c:2512
+#: config.c:2513
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100"
-#: config.c:2558
+#: config.c:2559
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "incapaz analisar '%s' da configuração de linha de comandos"
-#: config.c:2560
+#: config.c:2561
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
-#: config.c:2644
+#: config.c:2645
#, fuzzy, c-format
msgid "invalid section name '%s'"
msgstr "conteúdo inválido: '%s'"
-#: config.c:2676
+#: config.c:2677
#, c-format
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
-#: config.c:2705
+#: config.c:2706
#, fuzzy, c-format
msgid "failed to write new configuration file %s"
msgstr "falha a escrever novo ficheiro configuração %s"
-#: config.c:2957 config.c:3283
+#: config.c:2958 config.c:3285
#, fuzzy, c-format
msgid "could not lock config file %s"
msgstr "incapaz trancar ficheiro config %s"
-#: config.c:2968
+#: config.c:2969
#, fuzzy, c-format
msgid "opening %s"
msgstr "abrindo %s"
-#: config.c:3005 builtin/config.c:361
+#: config.c:3006 builtin/config.c:361
#, fuzzy, c-format
msgid "invalid pattern: %s"
msgstr "padrão inválido: %s"
-#: config.c:3030
+#: config.c:3031
#, fuzzy, c-format
msgid "invalid config file %s"
msgstr "ficheiro config inválido %s"
-#: config.c:3043 config.c:3296
+#: config.c:3044 config.c:3298
#, c-format
msgid "fstat on %s failed"
msgstr "falha de fstat de %s"
-#: config.c:3054
+#: config.c:3055
#, fuzzy, c-format
-msgid "unable to mmap '%s'"
+msgid "unable to mmap '%s'%s"
msgstr "incapaz mmap '%s'"
-#: config.c:3063 config.c:3301
+#: config.c:3065 config.c:3303
#, fuzzy, c-format
msgid "chmod on %s failed"
msgstr "falha de fstat de %s"
-#: config.c:3148 config.c:3398
+#: config.c:3150 config.c:3400
#, fuzzy, c-format
msgid "could not write config file %s"
msgstr "incapaz escrever ficheiro config %s"
-#: config.c:3182
+#: config.c:3184
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "incapaz definir '%s' como '%s'"
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "incapaz desdefinir '%s'"
-#: config.c:3274
+#: config.c:3276
#, fuzzy, c-format
msgid "invalid section name: %s"
msgstr "opção inválida: %s"
-#: config.c:3441
+#: config.c:3443
#, fuzzy, c-format
msgid "missing value for '%s'"
msgstr "valor inválido de %s"
@@ -3156,7 +3156,7 @@ msgstr ""
msgid "unable to fork"
msgstr "incapaz de aforquilhar"
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "A verificar conectividade"
@@ -3414,38 +3414,38 @@ msgstr ""
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diff-merges.c:80
+#: diff-merges.c:70
#, fuzzy, c-format
msgid "unknown value for --diff-merges: %s"
msgstr "valor desconhecido '%s' da chave '%s'"
-#: diff-lib.c:538
+#: diff-lib.c:557
msgid "--merge-base does not work with ranges"
msgstr ""
-#: diff-lib.c:540
+#: diff-lib.c:559
msgid "--merge-base only works with commits"
msgstr ""
-#: diff-lib.c:557
+#: diff-lib.c:576
#, fuzzy
msgid "unable to get HEAD"
msgstr "incapaz obter HEAD"
-#: diff-lib.c:564
+#: diff-lib.c:583
msgid "no merge base found"
msgstr ""
-#: diff-lib.c:566
+#: diff-lib.c:585
msgid "multiple merge bases found"
msgstr ""
-#: diff-no-index.c:238
+#: diff-no-index.c:237
#, fuzzy
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
-#: diff-no-index.c:263
+#: diff-no-index.c:262
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
@@ -3494,36 +3494,48 @@ msgstr ""
"Erros encontrados na variável de configuração 'diff.dirstat':\n"
"%s"
-#: diff.c:4278
+#: diff.c:4282
#, c-format
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:4630
+#: diff.c:4634
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"
-#: diff.c:4633
+#: diff.c:4637
#, fuzzy
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: diff.c:4712
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+
+#: diff.c:4643
+#, fuzzy
+msgid ""
+"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr "-b, -B e --detach são mutuamente exclusivos"
+
+#: diff.c:4722
msgid "--follow requires exactly one pathspec"
msgstr "--follow requer exatamente um único especificador de caminho"
-#: diff.c:4760
+#: diff.c:4770
#, fuzzy, c-format
msgid "invalid --stat value: %s"
msgstr "valor de cor inválido: %.*s"
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
+#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
#, fuzzy, c-format
msgid "%s expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: diff.c:4797
+#: diff.c:4807
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3532,555 +3544,556 @@ msgstr ""
"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
"%s"
-#: diff.c:4882
+#: diff.c:4892
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4906
+#: diff.c:4916
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4920
+#: diff.c:4930
#, fuzzy, c-format
msgid "unable to resolve '%s'"
msgstr "incapaz resolver '%s'"
-#: diff.c:4970 diff.c:4976
+#: diff.c:4980 diff.c:4986
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4988
+#: diff.c:4998
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:5009
+#: diff.c:5019
#, fuzzy, c-format
msgid "bad --color-moved argument: %s"
msgstr "argumento incorreto --color-moved: %s"
-#: diff.c:5028
+#: diff.c:5038
#, fuzzy, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "objeto inválido '%s' fornecido."
-#: diff.c:5068
+#: diff.c:5078
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5104 diff.c:5124
+#: diff.c:5114 diff.c:5134
#, fuzzy, c-format
msgid "invalid argument to %s"
msgstr "valor inválido de %s"
-#: diff.c:5228
+#: diff.c:5238
#, fuzzy, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "valor inválido de %s"
-#: diff.c:5277
+#: diff.c:5287
#, fuzzy, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
-#: diff.c:5333
+#: diff.c:5343
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5369
+#: diff.c:5379
msgid "Diff output format options"
msgstr ""
-#: diff.c:5371 diff.c:5377
+#: diff.c:5381 diff.c:5387
#, fuzzy
msgid "generate patch"
msgstr "incorporar o patch"
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5384 builtin/log.c:179
msgid "suppress diff output"
msgstr "suprimir saída do diff"
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5389 diff.c:5503 diff.c:5510
msgid "<n>"
msgstr ""
-#: diff.c:5380 diff.c:5383
+#: diff.c:5390 diff.c:5393
#, fuzzy
msgid "generate diffs with <n> lines context"
msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
-#: diff.c:5385
+#: diff.c:5395
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5388
+#: diff.c:5398
#, fuzzy
msgid "synonym for '-p --raw'"
msgstr "(sinónimo de --stat)"
-#: diff.c:5392
+#: diff.c:5402
#, fuzzy
msgid "synonym for '-p --stat'"
msgstr "(sinónimo de --stat)"
-#: diff.c:5396
+#: diff.c:5406
#, fuzzy
msgid "machine friendly --stat"
msgstr "saída inteligível por máquina"
-#: diff.c:5399
+#: diff.c:5409
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5401 diff.c:5409
+#: diff.c:5411 diff.c:5419
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5402
+#: diff.c:5412
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5406
+#: diff.c:5416
#, fuzzy
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo de --files-with-matches"
-#: diff.c:5410
+#: diff.c:5420
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5414
+#: diff.c:5424
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5417
+#: diff.c:5427
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5420
+#: diff.c:5430
#, fuzzy
msgid "show only names of changed files"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: diff.c:5423
+#: diff.c:5433
#, fuzzy
msgid "show only names and status of changed files"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: diff.c:5425
+#: diff.c:5435
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5426
+#: diff.c:5436
#, fuzzy
msgid "generate diffstat"
msgstr "diff status inesperado %c"
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5438 diff.c:5441 diff.c:5444
msgid "<width>"
msgstr ""
-#: diff.c:5429
+#: diff.c:5439
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5432
+#: diff.c:5442
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5435
+#: diff.c:5445
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5437
+#: diff.c:5447
msgid "<count>"
msgstr ""
-#: diff.c:5438
+#: diff.c:5448
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5441
+#: diff.c:5451
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5444
+#: diff.c:5454
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5447
+#: diff.c:5457
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5449
+#: diff.c:5459
#, fuzzy
msgid "show colored diff"
msgstr "mostrar ficheiros ignorados"
-#: diff.c:5450
+#: diff.c:5460
msgid "<kind>"
msgstr ""
-#: diff.c:5451
+#: diff.c:5461
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5454
+#: diff.c:5464
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
#, fuzzy
msgid "<prefix>"
msgstr "<prefixo>/"
-#: diff.c:5458
+#: diff.c:5468
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5461
+#: diff.c:5471
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5464
+#: diff.c:5474
#, fuzzy
msgid "prepend an additional prefix to every line of output"
msgstr "preceder o nomebase do projeto pai na saída"
-#: diff.c:5467
+#: diff.c:5477
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5470
+#: diff.c:5480
#, fuzzy
msgid "show context between diff hunks up to the specified number of lines"
msgstr "criar um clone raso, truncado ao número especificado de revisões"
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5484 diff.c:5489 diff.c:5494
msgid "<char>"
msgstr ""
-#: diff.c:5475
+#: diff.c:5485
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5480
+#: diff.c:5490
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5485
+#: diff.c:5495
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5488
+#: diff.c:5498
#, fuzzy
msgid "Diff rename options"
msgstr "Opções genéricas"
-#: diff.c:5489
+#: diff.c:5499
#, fuzzy
msgid "<n>[/<m>]"
msgstr "<n>[,<base>]"
-#: diff.c:5490
+#: diff.c:5500
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5494
+#: diff.c:5504
#, fuzzy
msgid "detect renames"
msgstr "nome do remoto"
-#: diff.c:5498
+#: diff.c:5508
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5501
+#: diff.c:5511
msgid "detect copies"
msgstr ""
-#: diff.c:5505
+#: diff.c:5515
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5507
+#: diff.c:5517
#, fuzzy
msgid "disable rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
-#: diff.c:5510
+#: diff.c:5520
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5512
+#: diff.c:5522
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5515
+#: diff.c:5525
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5517
+#: diff.c:5527
#, fuzzy
msgid "Diff algorithm options"
msgstr "opção inválida: %s"
-#: diff.c:5519
+#: diff.c:5529
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5522
+#: diff.c:5532
#, fuzzy
msgid "ignore whitespace when comparing lines"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5525
+#: diff.c:5535
#, fuzzy
msgid "ignore changes in amount of whitespace"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5528
+#: diff.c:5538
#, fuzzy
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5531
+#: diff.c:5541
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5534
+#: diff.c:5544
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
msgid "<regex>"
msgstr ""
-#: diff.c:5537
+#: diff.c:5547
#, fuzzy
msgid "ignore changes whose all lines match <regex>"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: diff.c:5540
+#: diff.c:5550
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5543
+#: diff.c:5553
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5547
+#: diff.c:5557
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5549
+#: diff.c:5559
msgid "<algorithm>"
msgstr ""
-#: diff.c:5550
+#: diff.c:5560
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5552
+#: diff.c:5562
#, fuzzy
msgid "<text>"
msgstr "texto"
-#: diff.c:5553
+#: diff.c:5563
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5565 diff.c:5574 diff.c:5577
#, fuzzy
msgid "<mode>"
msgstr "modo"
-#: diff.c:5556
+#: diff.c:5566
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5559
+#: diff.c:5569
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5562
+#: diff.c:5572
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5565
+#: diff.c:5575
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5568
+#: diff.c:5578
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5571
+#: diff.c:5581
#, fuzzy
msgid "Other diff options"
msgstr "Opções genéricas"
-#: diff.c:5573
+#: diff.c:5583
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5577
+#: diff.c:5587
#, fuzzy
msgid "treat all files as text"
msgstr "processar ficheiros binários como texto"
-#: diff.c:5579
+#: diff.c:5589
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5581
+#: diff.c:5591
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5583
+#: diff.c:5593
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5585
+#: diff.c:5595
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5587
+#: diff.c:5597
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5589
+#: diff.c:5599
#, fuzzy
msgid "<when>"
msgstr "quando"
-#: diff.c:5590
+#: diff.c:5600
#, fuzzy
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
-#: diff.c:5593
+#: diff.c:5603
#, fuzzy
msgid "<format>"
msgstr "formato"
-#: diff.c:5594
+#: diff.c:5604
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5598
+#: diff.c:5608
#, fuzzy
msgid "hide 'git add -N' entries from the index"
msgstr "usar .gitattributes apenas a partir do índice"
-#: diff.c:5601
+#: diff.c:5611
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5603
+#: diff.c:5613
#, fuzzy
msgid "<string>"
msgstr "cadeia"
-#: diff.c:5604
+#: diff.c:5614
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5607
+#: diff.c:5617
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5610
+#: diff.c:5620
#, fuzzy
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar ficheiros com correspondências no paginador"
-#: diff.c:5613
+#: diff.c:5623
#, fuzzy
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "usar expressões regulares estendidas do POSIX"
-#: diff.c:5616
+#: diff.c:5626
#, fuzzy
msgid "control the order in which files appear in the output"
msgstr "mostrar outros ficheiros na saída"
-#: diff.c:5617 diff.c:5620
+#: diff.c:5627 diff.c:5630
#, fuzzy
msgid "<path>"
msgstr "path"
-#: diff.c:5618
+#: diff.c:5628
#, fuzzy
msgid "show the change in the specified path first"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: diff.c:5621
+#: diff.c:5631
#, fuzzy
msgid "skip the output to the specified path"
msgstr "Repor a HEAD atual no estado especificado"
-#: diff.c:5623
+#: diff.c:5633
#, fuzzy
msgid "<object-id>"
msgstr "objeto"
-#: diff.c:5624
+#: diff.c:5634
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5626
+#: diff.c:5636
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5627
+#: diff.c:5637
msgid "select files by diff type"
msgstr ""
-#: diff.c:5629
+#: diff.c:5639
#, fuzzy
msgid "<file>"
msgstr "ficheiro"
-#: diff.c:5630
+#: diff.c:5640
#, fuzzy
msgid "Output to a specific file"
msgstr "submeter somente os ficheiros especificados"
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6298
+#, fuzzy
+msgid "exhaustive 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:6290
+#: diff.c:6301
msgid "only found copies from modified paths due to too many files."
msgstr ""
"só foram encontradas cópias de caminhos modificados devido a demasiados "
"ficheiros."
-#: diff.c:6293
+#: diff.c:6304
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -4092,7 +4105,7 @@ msgstr ""
msgid "failed to read orderfile '%s'"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1510
msgid "Performing inexact rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
@@ -4101,61 +4114,61 @@ msgstr "Deteção de mudança de nome inexata em curso"
msgid "No such path '%s' in the diff"
msgstr "path %s inexistente em %s"
-#: dir.c:578
+#: dir.c:593
#, fuzzy, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git"
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
#, fuzzy, c-format
msgid "unrecognized pattern: '%s'"
msgstr "padrão irreconhecível: '%s'"
-#: dir.c:777 dir.c:791
+#: dir.c:792 dir.c:806
#, fuzzy, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "por reconhecer padrão negativo: '%s'"
-#: dir.c:809
+#: dir.c:824
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:819
+#: dir.c:834
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1206
+#: dir.c:1221
#, fuzzy, c-format
msgid "cannot use %s as an exclude file"
msgstr "incapaz usar %s como ficheiro de exclusão"
-#: dir.c:2314
+#: dir.c:2358
#, fuzzy, c-format
msgid "could not open directory '%s'"
msgstr "incapaz abrir pasta '%s'"
-#: dir.c:2614
+#: dir.c:2660
msgid "failed to get kernel name and information"
msgstr "falha ao obter nome e informação do kernel"
-#: dir.c:2738
+#: dir.c:2784
#, fuzzy
msgid "untracked cache is disabled on this system or location"
msgstr "cache untracked está desativada neste sistema ou localização."
-#: dir.c:3543
+#: dir.c:3617
#, fuzzy, c-format
msgid "index file corrupt in repo %s"
msgstr "ficheiro de índice corrompido"
-#: dir.c:3590 dir.c:3595
+#: dir.c:3664 dir.c:3669
#, c-format
msgid "could not create directories for %s"
msgstr "incapaz criar pasta para %s"
-#: dir.c:3624
+#: dir.c:3698
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "incapaz migrar pasta git de '%s' para '%s'"
@@ -4165,12 +4178,12 @@ msgstr "incapaz migrar pasta git de '%s' para '%s'"
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:179
+#: entry.c:176
#, fuzzy
msgid "Filtering content"
msgstr "imprimir conteúdo da tag"
-#: entry.c:500
+#: entry.c:497
#, c-format
msgid "could not stat file '%s'"
msgstr "incapaz obter estatutário de ficheiro '%s'"
@@ -4350,7 +4363,7 @@ msgstr "commits comuns nenhuns"
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
+#: fetch-pack.c:1128 fetch-pack.c:1660
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: falha ao obter."
@@ -4374,7 +4387,7 @@ msgstr "Servidor insustenta pedidos shallow"
msgid "Server supports filter"
msgstr "Servidor sustenta filtro"
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1329 fetch-pack.c:2043
#, fuzzy
msgid "unable to write request to remote"
msgstr "incapaz escrever pedidos para remoto"
@@ -4432,25 +4445,25 @@ msgstr ""
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: esperava-se lista rasa"
-#: fetch-pack.c:1930
+#: fetch-pack.c:1939
msgid "no matching remote head"
msgstr "corresponde a remote head nenhuma"
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1962 builtin/clone.c:697
msgid "remote did not send all necessary objects"
msgstr "remoto faltou enviar todos objetos necessários"
-#: fetch-pack.c:2056
+#: fetch-pack.c:2065
#, fuzzy
msgid "unexpected 'ready' from remote"
msgstr "fim de ficheiro inesperado"
-#: fetch-pack.c:2079
+#: fetch-pack.c:2088
#, c-format
msgid "no such remote ref %s"
msgstr "referência remota %s inexistente"
-#: fetch-pack.c:2082
+#: fetch-pack.c:2091
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servidor proíbe pedido de objeto por anunciar %s"
@@ -4469,8 +4482,8 @@ msgid "gpg failed to sign the data"
msgstr "gpg falhou assinar os dados"
#: graph.c:98
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#, fuzzy, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "ignorar cor inválida '%.*s' em log.graphColors"
#: grep.c:531
@@ -4479,18 +4492,18 @@ msgid ""
"with -P under PCRE v2"
msgstr ""
-#: grep.c:1893
+#: grep.c:1895
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': incapaz ler %s"
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "falha ao invocar stat de '%s'"
-#: grep.c:1921
+#: grep.c:1923
#, c-format
msgid "'%s': short read"
msgstr "'%s': leitura truncada"
@@ -4727,7 +4740,7 @@ msgstr ""
#: list-objects-filter-options.c:105
#, fuzzy, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'%s' em '%s' é carimbo de data/hora inválido"
#: list-objects-filter-options.c:124
@@ -4772,7 +4785,7 @@ msgstr ""
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: list-objects.c:395
+#: list-objects.c:398
#, fuzzy, c-format
msgid "unable to load root tree for commit %s"
msgstr "incapaz carregar raiz de árvore para commit %s"
@@ -4819,39 +4832,39 @@ msgstr ""
msgid "bad action '%s' for '%s'"
msgstr "incapaz copiar '%s' para '%s'"
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1228 merge-recursive.c:1206
#, fuzzy, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1237 merge-recursive.c:1213
#, fuzzy, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1246 merge-recursive.c:1220
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1256 merge-ort.c:1263
#, fuzzy, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "Avanço-rápido para $sha1"
-#: merge-ort.c:1172
+#: merge-ort.c:1284
#, fuzzy, c-format
msgid "Failed to merge submodule %s"
msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
-#: merge-ort.c:1179
+#: merge-ort.c:1291
#, 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
+#: merge-ort.c:1295 merge-recursive.c:1274
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4862,42 +4875,42 @@ msgid ""
"which will accept this suggestion.\n"
msgstr ""
-#: merge-ort.c:1196
+#: merge-ort.c:1308
#, 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
+#: merge-ort.c:1527 merge-recursive.c:1363
msgid "Failed to execute internal merge"
msgstr "Falha ao executar integração interna"
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1532 merge-recursive.c:1368
#, c-format
msgid "Unable to add %s to database"
msgstr "Incapaz de adicionar %s à base de dados"
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1539 merge-recursive.c:1401
#, c-format
msgid "Auto-merging %s"
msgstr "A integrar automaticamente %s"
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:1678 merge-recursive.c:2123
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:1688 merge-recursive.c:2133
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-ort.c:1634
+#: merge-ort.c:1746
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4905,49 +4918,49 @@ msgid ""
"majority of the files."
msgstr ""
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:1900 merge-recursive.c:2469
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2044 merge-recursive.c:3252
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2051 merge-recursive.c:3259
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2064 merge-recursive.c:3255
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2072 merge-recursive.c:3262
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2103
+#: merge-ort.c:2228
#, fuzzy, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-ort.c:2198
+#: merge-ort.c:2323
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4955,62 +4968,62 @@ msgid ""
"markers."
msgstr ""
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2342 merge-ort.c:2366
#, fuzzy, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:2819 merge-recursive.c:3013
#, c-format
msgid "cannot read object %s"
msgstr "incapaz ler objeto %s"
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:2822 merge-recursive.c:3016
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s é blob nenhum"
-#: merge-ort.c:2981
+#: merge-ort.c:3250
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
-#: merge-ort.c:3055
+#: merge-ort.c:3326
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3062
+#: merge-ort.c:3333
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3433 merge-recursive.c:3092
msgid "content"
msgstr "conteúdo"
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3435 merge-recursive.c:3096
msgid "add/add"
msgstr "adicionar/adicionar"
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3437 merge-recursive.c:3141
msgid "submodule"
msgstr "submódulo"
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3439 merge-recursive.c:3142
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITO (%s): conflito de integração em %s"
-#: merge-ort.c:3198
+#: merge-ort.c:3470
#, fuzzy, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5019,7 +5032,7 @@ 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
+#: merge-ort.c:3757
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5029,12 +5042,12 @@ 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
+#: merge-ort.c:4116
#, 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
+#: merge-ort-wrappers.c:13 merge-recursive.c:3707
#, fuzzy, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5044,105 +5057,105 @@ msgstr ""
"integrar:\n"
"%%s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
#, fuzzy
msgid "Already up to date."
msgstr "Já está atualizado."
-#: merge-recursive.c:356
+#: merge-recursive.c:357
msgid "(bad commit)\n"
msgstr "(commit incorreto)\n"
-#: merge-recursive.c:379
+#: merge-recursive.c:380
#, fuzzy, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "addinfo_cache falhou no caminho '%s'"
-#: merge-recursive.c:388
+#: merge-recursive.c:389
#, fuzzy, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "addinfo_cache falhou no caminho '%s'"
-#: merge-recursive.c:876
+#: merge-recursive.c:877
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falha ao criar o caminho '%s'%s"
-#: merge-recursive.c:887
+#: merge-recursive.c:888
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "A remover %s para criar espaço para o subdiretório\n"
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:902 merge-recursive.c:921
msgid ": perhaps a D/F conflict?"
msgstr ": talvez um conflito D/F?"
-#: merge-recursive.c:910
+#: merge-recursive.c:911
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "recusando perder ficheiro untracked em '%s'"
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:952 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "incapaz ler objeto %s '%s'"
-#: merge-recursive.c:956
+#: merge-recursive.c:957
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob para %s '%s' esperado"
-#: merge-recursive.c:981
+#: merge-recursive.c:982
#, c-format
msgid "failed to open '%s': %s"
msgstr "falha ao abrir '%s': %s"
-#: merge-recursive.c:992
+#: merge-recursive.c:993
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falha ao criar a ligação simbólica '%s': %s"
-#: merge-recursive.c:997
+#: merge-recursive.c:998
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "desconheço que fazer com %06o %s '%s'"
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1228 merge-recursive.c:1240
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1231 merge-recursive.c:1243
#, fuzzy, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avanço-rápido para $sha1"
-#: merge-recursive.c:1265
+#: merge-recursive.c:1266
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1269
+#: merge-recursive.c:1270
#, fuzzy, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: merge-recursive.c:1270
+#: merge-recursive.c:1271
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1282
+#: merge-recursive.c:1283
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1424
+#: merge-recursive.c:1425
#, fuzzy, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"
-#: merge-recursive.c:1496
+#: merge-recursive.c:1497
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5151,7 +5164,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:1501
+#: merge-recursive.c:1502
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5160,7 +5173,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:1508
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5169,7 +5182,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:1513
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5178,43 +5191,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:1548
+#: merge-recursive.c:1549
msgid "rename"
msgstr "mudar nome"
-#: merge-recursive.c:1548
+#: merge-recursive.c:1549
msgid "renamed"
msgstr "nome mudado"
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
#, fuzzy, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Recusando perder ficheiro sujo de %s"
-#: merge-recursive.c:1609
+#: merge-recursive.c:1610
#, fuzzy, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."
-#: merge-recursive.c:1667
+#: merge-recursive.c:1668
#, fuzzy, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-recursive.c:1698
+#: merge-recursive.c:1699
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s é um diretório em %s adicionando %s no seu lugar"
-#: merge-recursive.c:1703
+#: merge-recursive.c:1704
#, fuzzy, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"
-#: merge-recursive.c:1730
+#: merge-recursive.c:1731
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5223,18 +5236,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:1735
+#: merge-recursive.c:1736
msgid " (left unresolved)"
msgstr " (por resolver)"
-#: merge-recursive.c:1827
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:2090
+#: merge-recursive.c:2091
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5242,7 +5255,7 @@ msgid ""
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2224
+#: merge-recursive.c:2225
#, fuzzy, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5251,79 +5264,79 @@ msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:3069
+#: merge-recursive.c:3080
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3069
+#: merge-recursive.c:3080
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3108
+#: merge-recursive.c:3119
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ignorado (integrado é igual ao existente)"
-#: merge-recursive.c:3161
+#: merge-recursive.c:3172
#, c-format
msgid "Adding as %s instead"
msgstr "A adicionar como %s, em alternativa."
-#: merge-recursive.c:3368
+#: merge-recursive.c:3376
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: merge-recursive.c:3391
+#: merge-recursive.c:3399
msgid "file/directory"
msgstr "ficheiro/diretório"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3404
msgid "directory/file"
msgstr "diretório/ficheiro"
-#: merge-recursive.c:3403
+#: merge-recursive.c:3411
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
-#: merge-recursive.c:3412
+#: merge-recursive.c:3420
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:3421
+#: merge-recursive.c:3429
#, fuzzy, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLITO (%s): conflito de integração em %s"
-#: merge-recursive.c:3474
+#: merge-recursive.c:3482
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falha ao integrar as árvores %s e %s"
-#: merge-recursive.c:3568
+#: merge-recursive.c:3576
msgid "Merging:"
msgstr "A integrar:"
-#: merge-recursive.c:3581
+#: merge-recursive.c:3589
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u antecessor comum encontrado:"
msgstr[1] "%u antecessores comuns encontrados:"
-#: merge-recursive.c:3631
+#: merge-recursive.c:3639
msgid "merge returned no commit"
msgstr "junção retornou commit nenhum"
-#: merge-recursive.c:3796
+#: merge-recursive.c:3804
#, c-format
msgid "Could not parse object '%s'"
msgstr "Incapaz de analisar objeto '%s'"
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
+#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
#: builtin/stash.c:473
msgid "Unable to write index."
msgstr "Incapaz de escrever no index."
@@ -5332,7 +5345,7 @@ msgstr "Incapaz de escrever no index."
msgid "failed to read the cache"
msgstr "falha ao ler a cache"
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
+#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
#: builtin/stash.c:267
msgid "unable to write new index file"
@@ -5408,112 +5421,120 @@ msgstr "falha ao abrir '%s'"
msgid "failed to locate object %d in packfile"
msgstr "Falha ao criar os ficheiros de saída"
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:880 builtin/index-pack.c:1533
#, fuzzy
msgid "cannot store reverse index file"
msgstr "incapaz guardar ficheiro index"
-#: midx.c:933
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+
+#: midx.c:943
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:979
+#: midx.c:989
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:1024
+#: midx.c:1034
#, fuzzy, c-format
msgid "unknown preferred pack: '%s'"
msgstr "Subcomando desconhecido: %s"
-#: midx.c:1029
+#: midx.c:1039
#, fuzzy, c-format
msgid "preferred pack '%s' is expired"
msgstr "o repositório de referência '%s' está enxertado"
-#: midx.c:1045
+#: midx.c:1055
#, fuzzy
msgid "no pack files to index."
msgstr "pack files nenhuns para index."
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1135 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "falha ao remover %s"
-#: midx.c:1156
+#: midx.c:1166
#, fuzzy, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falha ao limpar o índice"
-#: midx.c:1214
+#: midx.c:1225
msgid "multi-pack-index file exists, but failed to parse"
msgstr ""
-#: midx.c:1222
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr ""
+
+#: midx.c:1236
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1237
+#: midx.c:1251
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1242
+#: midx.c:1256
msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1251
+#: midx.c:1265
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1260
+#: midx.c:1274
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1280
+#: midx.c:1294
#, fuzzy
msgid "Sorting objects by packfile"
msgstr "A escrever objetos"
-#: midx.c:1287
+#: midx.c:1301
#, fuzzy
msgid "Verifying object offsets"
msgstr "A escrever objetos"
-#: midx.c:1303
+#: midx.c:1317
#, fuzzy, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "falhou carregar entrada pack para oid[%d] = %s"
-#: midx.c:1309
+#: midx.c:1323
#, fuzzy, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: midx.c:1318
+#: midx.c:1332
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1343
+#: midx.c:1357
#, fuzzy
msgid "Counting referenced objects"
msgstr "Contando objetos referenciados"
-#: midx.c:1353
+#: midx.c:1367
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1544
+#: midx.c:1558
#, fuzzy
msgid "could not start pack-objects"
msgstr "incapaz de começar pack-objects"
-#: midx.c:1564
+#: midx.c:1578
#, fuzzy
msgid "could not finish pack-objects"
msgstr "incapaz de terminar pack-objects"
@@ -5579,277 +5600,277 @@ msgstr "Valor incorreto de %s: '%s'"
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: object-file.c:577
+#: object-file.c:584
#, fuzzy, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "incapaz normalizar path de objeto alternativo: %s"
-#: object-file.c:649
+#: object-file.c:658
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: object-file.c:656
+#: object-file.c:665
#, fuzzy, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz normalizar pasta de objeto: %s"
-#: object-file.c:699
+#: object-file.c:708
#, fuzzy
msgid "unable to fdopen alternates lockfile"
msgstr "incapaz de fdopen lockfile alternativo"
-#: object-file.c:717
+#: object-file.c:726
#, fuzzy
msgid "unable to read alternates file"
msgstr "incapaz ler ficheiro alternativo"
-#: object-file.c:724
+#: object-file.c:733
#, fuzzy
msgid "unable to move new alternates file into place"
msgstr "incapaz mover novo ficheiro alternativo para o sítio"
-#: object-file.c:759
+#: object-file.c:768
#, c-format
msgid "path '%s' does not exist"
msgstr "caminho '%s' é inexistente"
-#: object-file.c:780
+#: object-file.c:789
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repositório referência '%s' como uma checkout ligada ainda é insustentado."
-#: object-file.c:786
+#: object-file.c:795
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositório referência '%s' é repositório local nenhum."
-#: object-file.c:792
+#: object-file.c:801
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "o repositório de referência '%s' é raso"
-#: object-file.c:800
+#: object-file.c:809
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "o repositório de referência '%s' está enxertado"
-#: object-file.c:860
+#: object-file.c:869
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: object-file.c:1010
+#: object-file.c:1019
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: object-file.c:1031
-#, fuzzy
-msgid "mmap failed"
+#: object-file.c:1054
+#, fuzzy, c-format
+msgid "mmap failed%s"
msgstr "%s falhou"
-#: object-file.c:1195
+#: object-file.c:1218
#, fuzzy, c-format
msgid "object file %s is empty"
msgstr "objeto local %s corrompido"
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1353 object-file.c:2548
#, fuzzy, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto solto '%s' corrupto"
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1355 object-file.c:2552
#, fuzzy, c-format
msgid "garbage at end of loose object '%s'"
msgstr "lixo no fim de objeto solto '%s'"
-#: object-file.c:1374
+#: object-file.c:1397
#, fuzzy
msgid "invalid object type"
msgstr "tipo de objeto incorreto."
-#: object-file.c:1458
+#: object-file.c:1481
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: object-file.c:1461
+#: object-file.c:1484
#, fuzzy, c-format
msgid "unable to unpack %s header"
msgstr "incapaz desempacotar cabeçalho %s"
-#: object-file.c:1467
+#: object-file.c:1490
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: object-file.c:1470
+#: object-file.c:1493
#, fuzzy, c-format
msgid "unable to parse %s header"
msgstr "incapaz processar cabeçalho %s"
-#: object-file.c:1697
+#: object-file.c:1717
#, fuzzy, c-format
msgid "failed to read object %s"
msgstr "falha ao ler o objeto '%s'."
-#: object-file.c:1701
+#: object-file.c:1721
#, fuzzy, c-format
msgid "replacement %s not found for %s"
msgstr "%s substituto, por encontrar para %s"
-#: object-file.c:1705
+#: object-file.c:1725
#, fuzzy, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "objeto local %s corrompido"
-#: object-file.c:1709
+#: object-file.c:1729
#, fuzzy, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "objeto local %s corrompido"
-#: object-file.c:1814
+#: object-file.c:1834
#, fuzzy, c-format
msgid "unable to write file %s"
msgstr "incapaz escrever ficheiro %s"
-#: object-file.c:1821
+#: object-file.c:1841
#, fuzzy, c-format
msgid "unable to set permission to '%s'"
msgstr "incapaz definir permissão para '%s'"
-#: object-file.c:1828
+#: object-file.c:1848
#, fuzzy
msgid "file write error"
msgstr "falha ao escrever para rev-list"
-#: object-file.c:1848
+#: object-file.c:1868
#, fuzzy
msgid "error when closing loose object file"
msgstr "erro ao fechar ficheiro de pacote"
-#: object-file.c:1913
+#: object-file.c:1933
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: object-file.c:1915
+#: object-file.c:1935
#, fuzzy
msgid "unable to create temporary file"
msgstr "incapaz criar ficheiro temporário"
-#: object-file.c:1939
+#: object-file.c:1959
#, fuzzy
msgid "unable to write loose object file"
msgstr "incapaz escrever ficheiro objeto solto"
-#: object-file.c:1945
+#: object-file.c:1965
#, fuzzy, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "incapaz esvaziar objeto novo %s (%d)"
-#: object-file.c:1949
+#: object-file.c:1969
#, fuzzy, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "falha de fstat de %s"
-#: object-file.c:1953
+#: object-file.c:1973
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1983 builtin/pack-objects.c:1237
#, fuzzy, c-format
msgid "failed utime() on %s"
msgstr "falha ao abrir '%s'"
-#: object-file.c:2040
+#: object-file.c:2060
#, fuzzy, c-format
msgid "cannot read object for %s"
msgstr "incapaz ler objeto para %s"
-#: object-file.c:2091
+#: object-file.c:2111
#, fuzzy
msgid "corrupt commit"
msgstr "substituir autor do commit"
-#: object-file.c:2099
+#: object-file.c:2119
#, fuzzy
msgid "corrupt tag"
msgstr "mostrar tags"
-#: object-file.c:2199
+#: object-file.c:2219
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: object-file.c:2202
+#: object-file.c:2222
#, fuzzy, c-format
msgid "short read while indexing %s"
msgstr "leitura curta enquanto indexando %s"
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2295 object-file.c:2305
#, fuzzy, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falhou inserir na base de dados"
-#: object-file.c:2291
+#: object-file.c:2311
#, fuzzy, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo ficheiro insustentado"
-#: object-file.c:2315
+#: object-file.c:2335
#, fuzzy, c-format
msgid "%s is not a valid object"
msgstr "%s é objeto inválido"
-#: object-file.c:2317
+#: object-file.c:2337
#, 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
+#: object-file.c:2364 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr "incapaz abrir %s"
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2559 object-file.c:2612
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: object-file.c:2559
+#: object-file.c:2583
#, fuzzy, c-format
msgid "unable to mmap %s"
msgstr "incapaz mmap %s"
-#: object-file.c:2564
+#: object-file.c:2588
#, fuzzy, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz desempacotar cabeçalho de %s"
-#: object-file.c:2570
+#: object-file.c:2594
#, fuzzy, c-format
msgid "unable to parse header of %s"
msgstr "incapaz processar cabeçalho de %s"
-#: object-file.c:2581
+#: object-file.c:2605
#, fuzzy, c-format
msgid "unable to unpack contents of %s"
msgstr "incapaz desempacotar conteúdo de %s"
-#: object-name.c:486
+#: object-name.c:480
#, fuzzy, c-format
msgid "short object ID %s is ambiguous"
msgstr "SHA1 curto %s é ambíguo"
-#: object-name.c:497
+#: object-name.c:491
msgid "The candidates are:"
msgstr "Os candidatos são:"
-#: object-name.c:796
+#: object-name.c:790
#, fuzzy
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
@@ -5872,65 +5893,65 @@ msgstr ""
"examine estas refs e talvez apague-as. Desative esta mensagem\n"
"executando \"git config advice.objectNameWarning false\""
-#: object-name.c:916
+#: object-name.c:910
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr ""
-#: object-name.c:924
+#: object-name.c:918
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr ""
-#: object-name.c:1702
+#: object-name.c:1696
#, fuzzy, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-#: object-name.c:1708
+#: object-name.c:1702
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
msgstr ""
-#: object-name.c:1717
+#: object-name.c:1711
#, fuzzy, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "caminho '%s' é inexistente em '%.*s'"
-#: object-name.c:1745
+#: object-name.c:1739
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"
msgstr ""
-#: object-name.c:1761
+#: object-name.c:1755
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
msgstr ""
-#: object-name.c:1769
+#: object-name.c:1763
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr ""
-#: object-name.c:1771
+#: object-name.c:1765
#, fuzzy, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "caminho '%s' é inexistente (quer no disco quer no index)"
-#: object-name.c:1784
+#: object-name.c:1778
#, fuzzy
msgid "relative path syntax can't be used outside working tree"
msgstr ""
"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
"trabalho"
-#: object-name.c:1922
+#: object-name.c:1916
#, fuzzy, c-format
msgid "invalid object name '%.*s'."
msgstr "Nome de objeto inválido: '%s'."
@@ -5945,27 +5966,27 @@ msgstr "objeto blob inválido %s"
msgid "object %s is a %s, not a %s"
msgstr "objeto %s é %s, é %s nenhum(a)"
-#: object.c:232
+#: object.c:250
#, fuzzy, c-format
msgid "object %s has unknown type id %d"
msgstr "objeto de tipo desconhecido"
-#: object.c:245
+#: object.c:263
#, c-format
msgid "unable to parse object: %s"
msgstr "incapaz analisar objeto: %s"
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
#, fuzzy, c-format
msgid "unable to get size of %s"
msgstr "incapaz obter tamanho de %s"
-#: pack-bitmap.c:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
#, fuzzy, c-format
msgid "unable to get disk usage of %s"
msgstr "incapaz obter tamanho de %s"
@@ -6019,12 +6040,17 @@ msgstr "incapaz escrever '%s'"
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
-#: packfile.c:1937
+#: packfile.c:655
+#, fuzzy, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "objeto %s incapaz ser lido"
+
+#: packfile.c:1934
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
-#: packfile.c:1941
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
@@ -6232,8 +6258,8 @@ msgstr "incapaz escrever pacote delim"
#: pkt-line.c:106
#, fuzzy
-msgid "unable to write stateless separator packet"
-msgstr "incapaz escrever pacote de separador sem estado"
+msgid "unable to write response end packet"
+msgstr "incapaz escrever pacote flush"
#: pkt-line.c:113
#, fuzzy
@@ -6297,19 +6323,19 @@ msgstr "incapaz criar thread de lstat: %s"
msgid "unable to parse --pretty format"
msgstr "incapaz analisar formato de --pretty"
-#: promisor-remote.c:30
+#: promisor-remote.c:31
msgid "promisor-remote: unable to fork off fetch subprocess"
msgstr ""
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
msgid "promisor-remote: could not write to fetch subprocess"
msgstr ""
-#: promisor-remote.c:41
+#: promisor-remote.c:44
msgid "promisor-remote: could not close stdin to fetch subprocess"
msgstr ""
-#: promisor-remote.c:53
+#: promisor-remote.c:54
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr ""
@@ -6333,7 +6359,7 @@ msgstr "incapaz começar `log`"
msgid "could not read `log` output"
msgstr "incapaz ler output de `log`"
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:101 sequencer.c:5550
#, fuzzy, c-format
msgid "could not parse commit '%s'"
msgstr "incapaz analisar commit '%s'"
@@ -6350,67 +6376,67 @@ msgstr ""
msgid "could not parse git header '%.*s'"
msgstr "incapaz analisar cabeçalho git '%.*s'"
-#: range-diff.c:306
+#: range-diff.c:307
#, fuzzy
msgid "failed to generate diff"
msgstr "falha ao criar o ficheiro %s"
-#: range-diff.c:558
+#: range-diff.c:559
#, 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
+#: range-diff.c:562 range-diff.c:564
#, fuzzy, c-format
msgid "could not parse log for '%s'"
msgstr "incapaz analisar log para '%s'"
-#: read-cache.c:708
+#: read-cache.c:710
#, fuzzy, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "%s: já existe no índice"
-#: read-cache.c:724
+#: read-cache.c:726
#, fuzzy
msgid "cannot create an empty blob in the object database"
msgstr "escrever o objeto na base de dados de objetos"
-#: read-cache.c:746
+#: read-cache.c:748
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: read-cache.c:751
+#: read-cache.c:753
#, fuzzy, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' tem commit checked out nenhum"
-#: read-cache.c:803
+#: read-cache.c:805
#, fuzzy, c-format
msgid "unable to index file '%s'"
msgstr "incapaz indexar ficheiro '%s'"
-#: read-cache.c:822
+#: read-cache.c:824
#, fuzzy, c-format
msgid "unable to add '%s' to index"
msgstr "incapaz adicionar %s a index"
-#: read-cache.c:833
+#: read-cache.c:835
#, fuzzy, c-format
msgid "unable to stat '%s'"
msgstr "incapaz obter estatutário de '%s'"
-#: read-cache.c:1356
+#: read-cache.c:1358
#, fuzzy, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' aparece ambo como ficheiro e como pasta"
-#: read-cache.c:1571
+#: read-cache.c:1573
#, fuzzy
msgid "Refresh index"
msgstr "Refresca index"
-#: read-cache.c:1700
+#: read-cache.c:1705
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -6419,7 +6445,7 @@ msgstr ""
"index.version definido, mas com valor inválido.\n"
"A usar a versão %i"
-#: read-cache.c:1710
+#: read-cache.c:1715
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6428,145 +6454,145 @@ msgstr ""
"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
"A usar a versão %i"
-#: read-cache.c:1766
+#: read-cache.c:1771
#, fuzzy, c-format
msgid "bad signature 0x%08x"
msgstr "adicionar uma assinatura"
-#: read-cache.c:1769
+#: read-cache.c:1774
#, fuzzy, c-format
msgid "bad index version %d"
msgstr "versão de índice '%s' incorreta"
-#: read-cache.c:1778
+#: read-cache.c:1783
#, fuzzy
msgid "bad index file sha1 signature"
msgstr "adicionar uma assinatura"
-#: read-cache.c:1812
+#: read-cache.c:1817
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1814
+#: read-cache.c:1819
#, fuzzy, c-format
msgid "ignoring %.4s extension"
msgstr "modelo %s ignorado"
-#: read-cache.c:1851
+#: read-cache.c:1856
#, fuzzy, c-format
msgid "unknown index entry format 0x%08x"
msgstr "formato de %.*s desconhecido %s"
-#: read-cache.c:1867
+#: read-cache.c:1872
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1924
+#: read-cache.c:1929
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1927
+#: read-cache.c:1932
#, fuzzy, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "multíplas entradas de estágio para ficheiro juntado '%s'"
-#: read-cache.c:1930
+#: read-cache.c:1935
#, fuzzy, c-format
msgid "unordered stage entries for '%s'"
msgstr "entradas de estágio desordenadas para '%s'"
-#: 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
+#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
+#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: builtin/submodule--helper.c:331
msgid "index file corrupt"
msgstr "ficheiro de índice corrompido"
-#: read-cache.c:2180
+#: read-cache.c:2185
#, fuzzy, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "incapaz criar thread load_cache_entries: %s"
-#: read-cache.c:2193
+#: read-cache.c:2198
#, fuzzy, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "incapaz juntar a thread load_cache_entries: %s"
-#: read-cache.c:2226
+#: read-cache.c:2231
#, fuzzy, c-format
msgid "%s: index file open failed"
msgstr "falha ao adicionar ficheiros"
-#: read-cache.c:2230
+#: read-cache.c:2235
#, fuzzy, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: incapaz obter estatutário de index aberto"
-#: read-cache.c:2234
+#: read-cache.c:2239
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2238
+#: read-cache.c:2243
#, fuzzy, c-format
-msgid "%s: unable to map index file"
+msgid "%s: unable to map index file%s"
msgstr "%s: incapaz mapear ficheiro index"
-#: read-cache.c:2280
+#: read-cache.c:2286
#, fuzzy, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "incapaz criar thread load_index_extensions: %s"
-#: read-cache.c:2307
+#: read-cache.c:2313
#, fuzzy, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "incapaz juntar a thread load_index_extensions: %s"
-#: read-cache.c:2345
+#: read-cache.c:2351
#, fuzzy, c-format
msgid "could not freshen shared index '%s'"
msgstr "incapaz refrescar index partilhado '%s'"
-#: read-cache.c:2392
+#: read-cache.c:2398
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
#, c-format
msgid "could not close '%s'"
msgstr "incapaz fechar '%s'"
-#: read-cache.c:3138
+#: read-cache.c:3074
#, 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
+#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
#, fuzzy, c-format
msgid "could not stat '%s'"
msgstr "incapaz obter estatutário '%s'"
-#: read-cache.c:3222
+#: read-cache.c:3158
#, c-format
msgid "unable to open git dir: %s"
msgstr "incapaz abrir pasta git: %s"
-#: read-cache.c:3234
+#: read-cache.c:3170
#, c-format
msgid "unable to unlink: %s"
msgstr "incapaz deslinkar: %s"
-#: read-cache.c:3263
+#: read-cache.c:3199
#, fuzzy, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "incapaz arranjar bits de permissão em '%s'"
-#: read-cache.c:3412
+#: read-cache.c:3348
#, fuzzy, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: incapaz baixar para estágio #0"
@@ -6673,8 +6699,8 @@ msgstr ""
"No entanto, se remover tudo, o rebase será abortado.\n"
"\n"
-#: 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
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
+#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
#, fuzzy, c-format
msgid "could not write '%s'"
msgstr "incapaz escrever '%s'"
@@ -6718,7 +6744,7 @@ msgstr ""
msgid "could not read '%s'."
msgstr "incapaz ler '%s'."
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2036
msgid "gone"
msgstr "desapareceu"
@@ -6737,248 +6763,248 @@ msgstr "atrás %d"
msgid "ahead %d, behind %d"
msgstr "à frente %d, atrás %d"
-#: ref-filter.c:175
+#: ref-filter.c:230
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<cor>)"
-#: ref-filter.c:177
+#: ref-filter.c:232
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "cor desconhecida: %%(color:%s)"
-#: ref-filter.c:199
+#: ref-filter.c:254
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor inteiro esperado refname:lstrip=%s"
-#: ref-filter.c:203
+#: ref-filter.c:258
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor inteiro esperado refname:rstrip=%s"
-#: ref-filter.c:205
+#: ref-filter.c:260
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento %%(%s) desconhecido: %s"
-#: ref-filter.c:260
+#: ref-filter.c:315
#, fuzzy, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) leva argumentos nenhuns"
-#: ref-filter.c:282
+#: ref-filter.c:339
#, fuzzy, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argumento %%(objectsize) desconhecido: %s"
-#: ref-filter.c:290
+#: ref-filter.c:347
#, fuzzy, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) leva argumentos nenhuns"
-#: ref-filter.c:302
+#: ref-filter.c:359
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) leva argumentos nenhuns"
-#: ref-filter.c:315
+#: ref-filter.c:372
#, fuzzy, c-format
msgid "unrecognized %%(subject) argument: %s"
msgstr "argumento %%(subject) desconhecido: %s"
-#: ref-filter.c:334
+#: ref-filter.c:391
#, c-format
msgid "expected %%(trailers:key=<value>)"
msgstr ""
-#: ref-filter.c:336
+#: ref-filter.c:393
#, fuzzy, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argumento %%(trailers) desconhecido: %s"
-#: ref-filter.c:367
+#: ref-filter.c:424
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:369
+#: ref-filter.c:426
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %%(contents) desconhecido: %s"
-#: ref-filter.c:384
+#: ref-filter.c:441
#, fuzzy, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:388
+#: ref-filter.c:445
#, fuzzy, c-format
msgid "unrecognized argument '%s' in %%(%s)"
msgstr "argumento '%s' desconhecido em %%(%s)"
-#: ref-filter.c:402
+#: ref-filter.c:459
#, fuzzy, c-format
msgid "unrecognized email option: %s"
msgstr "opção de email desconhecida: %s"
-#: ref-filter.c:432
+#: ref-filter.c:489
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<largura>,<posição>)"
-#: ref-filter.c:444
+#: ref-filter.c:501
#, c-format
msgid "unrecognized position:%s"
msgstr "posição desconhecida: %s"
-#: ref-filter.c:451
+#: ref-filter.c:508
#, c-format
msgid "unrecognized width:%s"
msgstr "largura desconhecida: %s"
-#: ref-filter.c:460
+#: ref-filter.c:517
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento %%(align) desconhecido: %s"
-#: ref-filter.c:468
+#: ref-filter.c:525
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "largura positiva esperada com o átomo %%(algn)"
-#: ref-filter.c:486
+#: ref-filter.c:543
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento %%(if) desconhecido: %s"
-#: ref-filter.c:588
+#: ref-filter.c:645
#, c-format
msgid "malformed field name: %.*s"
msgstr "nome de ficheiro malformado: %.*s"
-#: ref-filter.c:615
+#: ref-filter.c:672
#, c-format
msgid "unknown field name: %.*s"
msgstr "nome do campo desconhecido: %.*s"
-#: ref-filter.c:619
+#: ref-filter.c:676
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:743
+#: ref-filter.c:801
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente"
-#: ref-filter.c:807
+#: ref-filter.c:865
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente"
-#: ref-filter.c:809
+#: ref-filter.c:867
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: átomo %%(then) utilizado mais que uma vez"
-#: ref-filter.c:811
+#: ref-filter.c:869
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) utilizado depois de %%(else)"
-#: ref-filter.c:839
+#: ref-filter.c:897
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente"
-#: ref-filter.c:841
+#: ref-filter.c:899
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente"
-#: ref-filter.c:843
+#: ref-filter.c:901
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: átomo %%(else) utilizado mais que uma vez"
-#: ref-filter.c:858
+#: ref-filter.c:916
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
-#: ref-filter.c:915
+#: ref-filter.c:973
#, c-format
msgid "malformed format string %s"
msgstr "cadeia malformada %s"
-#: ref-filter.c:1556
+#: ref-filter.c:1621
#, fuzzy, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ramo nenhum, rebaseando %s)"
-#: ref-filter.c:1559
+#: ref-filter.c:1624
#, fuzzy, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(ramo nenhum, rebaseando HEAD solta %s)"
-#: ref-filter.c:1562
+#: ref-filter.c:1627
#, fuzzy, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ramo nenhum, bisseção iniciada em %s)"
-#: ref-filter.c:1566
+#: ref-filter.c:1631
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD destacada em %s)"
-#: ref-filter.c:1569
+#: ref-filter.c:1634
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD destacada de %s)"
-#: ref-filter.c:1572
+#: ref-filter.c:1637
#, fuzzy
msgid "(no branch)"
msgstr "(ramo nenhum)"
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1669 ref-filter.c:1880
#, c-format
msgid "missing object %s for %s"
msgstr "falta o objeto %s de %s"
-#: ref-filter.c:1614
+#: ref-filter.c:1679
#, 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:1997
+#: ref-filter.c:2064
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado em '%s'"
-#: ref-filter.c:2086
+#: ref-filter.c:2153
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "a referência %s com nome danificado foi ignorada"
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2158 refs.c:676
#, c-format
msgid "ignoring broken ref %s"
msgstr "a referência %s danificada foi ignorada"
-#: ref-filter.c:2431
+#: ref-filter.c:2498
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2525
+#: ref-filter.c:2592
#, c-format
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
-#: ref-filter.c:2530
+#: ref-filter.c:2597
#, fuzzy, c-format
msgid "option `%s' must point to a commit"
msgstr "opção '%s' tem apontar para um commit"
@@ -7407,8 +7433,8 @@ msgstr "incapaz deslinkar o perdido '%s'"
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "incapaz criar pasta '%s'"
@@ -7448,38 +7474,38 @@ 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:3669
+#: reset.c:70 reset.c:76 sequencer.c:3689
#, fuzzy, c-format
msgid "failed to find tree of %s"
msgstr "Falha ao procurar árvore de %s."
-#: revision.c:2343
+#: revision.c:2344
msgid "--unpacked=<packfile> no longer supported"
msgstr ""
-#: revision.c:2683
+#: revision.c:2684
msgid "your current branch appears to be broken"
msgstr "o ramo atual parece estar danificado"
-#: revision.c:2686
+#: revision.c:2687
#, 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:2892
+#: revision.c:2893
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:767
+#: run-command.c:766
msgid "open /dev/null failed"
msgstr "falha ao abrir /dev/null"
-#: run-command.c:1275
+#: run-command.c:1274
#, fuzzy, c-format
msgid "cannot create async thread: %s"
msgstr "incapaz criar thread assíncrona: %s"
-#: run-command.c:1345
+#: run-command.c:1344
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -7514,16 +7540,16 @@ msgstr "fetch-pack: incapaz de aforquilhar %s"
msgid "push negotiation failed; proceeding anyway with push"
msgstr ""
-#: send-pack.c:520
+#: send-pack.c:526
#, 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:529
+#: send-pack.c:535
msgid "the receiving end does not support --signed push"
msgstr "o recetor insustenta atiro --signed"
-#: send-pack.c:531
+#: send-pack.c:537
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -7531,11 +7557,11 @@ msgstr ""
"certificado de atiro por enviar uma vez que o recetor insustenta atirocom --"
"signed"
-#: send-pack.c:543
+#: send-pack.c:544
msgid "the receiving end does not support --atomic push"
msgstr "o recetor insustenta atiro com --atomic"
-#: send-pack.c:548
+#: send-pack.c:549
msgid "the receiving end does not support push options"
msgstr "o recetor insustenta opções de atiro"
@@ -7596,7 +7622,7 @@ msgid "could not lock '%s'"
msgstr "incapaz bloquear '%s'"
#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
#, c-format
msgid "could not write to '%s'"
msgstr "incapaz escrever em '%s'"
@@ -7607,7 +7633,7 @@ msgid "could not write eol to '%s'"
msgstr "incapaz escrever fim de linha em '%s'"
#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: sequencer.c:3555
#, fuzzy, c-format
msgid "failed to finalize '%s'"
msgstr "falha ao finalizar '%s'."
@@ -7659,8 +7685,8 @@ msgstr ""
msgid "unable to dequote value of '%s'"
msgstr "incapaz retirar valor, da citação '%s'"
-#: 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
+#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
+#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "incapaz abrir '%s' para leitura"
@@ -7808,7 +7834,7 @@ msgstr "incapaz processar HEAD"
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s é commit nenhum!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
msgid "could not parse HEAD commit"
msgstr "incapaz analisar commit HEAD"
@@ -7817,7 +7843,7 @@ msgstr "incapaz analisar commit HEAD"
msgid "unable to parse commit author"
msgstr "incapaz processar autor de commit"
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falhou ao escrever uma árvore"
@@ -7835,12 +7861,13 @@ msgstr "caminho inválido '%s'"
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
+#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "incapaz atualizar %s"
@@ -7892,7 +7919,7 @@ msgstr "incapaz escrever '%s'"
msgid "need a HEAD to fixup"
msgstr "necessária uma HEAD para fixup"
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1936 sequencer.c:3582
msgid "could not read HEAD"
msgstr "incapaz ler HEAD"
@@ -8036,7 +8063,7 @@ msgstr ""
msgid "malformed options sheet: '%s'"
msgstr "folha de opções malformada: '%s'"
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3012 sequencer.c:4868
msgid "empty commit set passed"
msgstr "o conjunto de commits especificado está vazio"
@@ -8069,7 +8096,7 @@ msgstr "incapaz criar pasta do sequenciador '%s'"
msgid "could not lock HEAD"
msgstr "incapaz bloquear HEAD"
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3125 sequencer.c:4581
msgid "no cherry-pick or revert in progress"
msgstr "sem cherry-pick ou revert em curso"
@@ -8081,7 +8108,7 @@ msgstr "incapaz resolver HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "incapaz abortar de um ramo ainda por nascer"
-#: sequencer.c:3159 builtin/grep.c:759
+#: sequencer.c:3159 builtin/grep.c:758
#, c-format
msgid "cannot open '%s'"
msgstr "incapaz abrir '%s'"
@@ -8130,7 +8157,7 @@ msgid ""
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3411 sequencer.c:4472
msgid "cannot read HEAD"
msgstr "incapaz ler HEAD"
@@ -8214,94 +8241,94 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3571
+#: sequencer.c:3572
#, fuzzy, c-format
msgid "illegal label name: '%.*s'"
msgstr "nome de ficheiro malformado: %.*s"
-#: sequencer.c:3625
+#: sequencer.c:3645
#, fuzzy
msgid "writing fake root commit"
msgstr "escrevendo commit de raíz falso"
-#: sequencer.c:3630
+#: sequencer.c:3650
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3714
+#: sequencer.c:3734
#, fuzzy, c-format
msgid "could not resolve '%s'"
msgstr "incapaz resolver '%s'"
-#: sequencer.c:3747
+#: sequencer.c:3767
#, fuzzy
msgid "cannot merge without a current revision"
msgstr "incapaz juntar sem uma revisão currente"
-#: sequencer.c:3769
+#: sequencer.c:3789
#, fuzzy, c-format
msgid "unable to parse '%.*s'"
msgstr "incapaz processar '%.*s'"
-#: sequencer.c:3778
+#: sequencer.c:3798
#, fuzzy, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada a juntar: '%.*s'"
-#: sequencer.c:3790
+#: sequencer.c:3810
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3806
+#: sequencer.c:3826
#, fuzzy, c-format
msgid "could not get commit message of '%s'"
msgstr "incapaz obter mensagem de commit de '%s'"
-#: sequencer.c:3989
+#: sequencer.c:4009
#, fuzzy, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "incapaz de tentar juntar '%.*s'"
-#: sequencer.c:4005
+#: sequencer.c:4025
#, fuzzy
msgid "merge: Unable to write new index file"
msgstr "merge: Incapaz de escrever novo ficheiro index"
-#: sequencer.c:4079
+#: sequencer.c:4099
msgid "Cannot autostash"
msgstr "Incapaz de arrumar automaticamente (autostash)"
-#: sequencer.c:4082
+#: sequencer.c:4102
#, fuzzy, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Resposta de squash inexperada: '%s'"
-#: sequencer.c:4088
+#: sequencer.c:4108
#, fuzzy, c-format
msgid "Could not create directory for '%s'"
msgstr "Incapaz de criar a pasta para '%s'"
-#: sequencer.c:4091
+#: sequencer.c:4111
#, fuzzy, c-format
msgid "Created autostash: %s\n"
msgstr "Criado autostash: %s\n"
-#: sequencer.c:4095
+#: sequencer.c:4115
#, fuzzy
msgid "could not reset --hard"
msgstr "incapaz repor --hard"
-#: sequencer.c:4120
+#: sequencer.c:4140
#, fuzzy, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:4132
+#: sequencer.c:4152
#, c-format
msgid "cannot store %s"
msgstr "incapaz guardar %s"
-#: sequencer.c:4135
+#: sequencer.c:4155
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -8312,30 +8339,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:4140
+#: sequencer.c:4160
#, fuzzy
msgid "Applying autostash resulted in conflicts."
msgstr "Patch aplicado a '%s' com conflitos."
-#: sequencer.c:4141
+#: sequencer.c:4161
msgid "Autostash exists; creating a new stash entry."
msgstr ""
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "incapaz soltar HEAD"
-#: sequencer.c:4249
+#: sequencer.c:4248
#, fuzzy, c-format
msgid "Stopped at HEAD\n"
msgstr "Parou no HEAD\n"
-#: sequencer.c:4251
+#: sequencer.c:4250
#, fuzzy, c-format
msgid "Stopped at %s\n"
msgstr "Parou a %s... %.*s\n"
-#: sequencer.c:4259
+#: sequencer.c:4258
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -8348,58 +8375,58 @@ msgid ""
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:4305
+#: sequencer.c:4304
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr ""
-#: sequencer.c:4351
+#: sequencer.c:4350
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Parou no %s... %.*s\n"
-#: sequencer.c:4422
+#: sequencer.c:4421
#, c-format
msgid "unknown command %d"
msgstr "comando desconhecido %d"
-#: sequencer.c:4481
+#: sequencer.c:4480
msgid "could not read orig-head"
msgstr "incapaz ler orig-head"
-#: sequencer.c:4486
+#: sequencer.c:4485
msgid "could not read 'onto'"
msgstr "incapaz ler 'onto'"
-#: sequencer.c:4500
+#: sequencer.c:4499
#, c-format
msgid "could not update HEAD to %s"
msgstr "incapaz atualizar HEAD para %s"
-#: sequencer.c:4560
+#: sequencer.c:4559
#, fuzzy, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
-#: sequencer.c:4612
+#: sequencer.c:4611
msgid "cannot rebase: You have unstaged changes."
msgstr "incapaz rebasear: tem alterações despreparadas."
-#: sequencer.c:4621
+#: sequencer.c:4620
msgid "cannot amend non-existing commit"
msgstr "incapaz emendar commit inexistente"
-#: sequencer.c:4623
+#: sequencer.c:4622
#, c-format
msgid "invalid file: '%s'"
msgstr "ficheiro inválido: '%s'"
-#: sequencer.c:4625
+#: sequencer.c:4624
#, c-format
msgid "invalid contents: '%s'"
msgstr "conteúdo inválido: '%s'"
-#: sequencer.c:4628
+#: sequencer.c:4627
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8409,52 +8436,52 @@ msgstr ""
"Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
"e execute 'git rebase --continue' de novo."
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4663 sequencer.c:4702
#, fuzzy, c-format
msgid "could not write file: '%s'"
msgstr "incapaz escrever ficheiro: '%s'"
-#: sequencer.c:4719
+#: sequencer.c:4718
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "incapaz remover CHERRY_PICK_HEAD"
-#: sequencer.c:4726
+#: sequencer.c:4725
msgid "could not commit staged changes."
msgstr "incapaz commit alterações preparadas."
-#: sequencer.c:4846
+#: sequencer.c:4845
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: incapaz apanhar um %s"
-#: sequencer.c:4850
+#: sequencer.c:4849
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:4885
+#: sequencer.c:4884
msgid "can't revert as initial commit"
msgstr "incapaz reverter como commit inicial"
-#: sequencer.c:5362
+#: sequencer.c:5361
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:5365
+#: sequencer.c:5364
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5614 sequencer.c:5631
#, fuzzy
msgid "nothing to do"
msgstr "nada a fazer"
-#: sequencer.c:5651
+#: sequencer.c:5650
#, fuzzy
msgid "could not skip unnecessary pick commands"
msgstr "incapaz de saltar comandos pick desnecessários"
-#: sequencer.c:5751
+#: sequencer.c:5750
msgid "the script was already rearranged."
msgstr ""
@@ -8505,94 +8532,99 @@ msgstr ""
msgid "unable to set up work tree using invalid config"
msgstr "incapaz preparar work tree usando config inválido"
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:661
+#: setup.c:658
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "extensões de repositório desconhecidas encontradas:"
+#: setup.c:666
+#, fuzzy
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "extensões de repositório desconhecidas encontradas:"
+msgstr[1] "extensões de repositório desconhecidas encontradas:"
-#: setup.c:681
+#: setup.c:680
#, fuzzy
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "extensões de repositório desconhecidas encontradas:"
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "extensões de repositório desconhecidas encontradas:"
+msgstr[1] "extensões de repositório desconhecidas encontradas:"
-#: setup.c:700
+#: setup.c:701
#, fuzzy, c-format
msgid "error opening '%s'"
msgstr "falha ao abrir '%s'"
-#: setup.c:702
+#: setup.c:703
#, fuzzy, c-format
msgid "too large to be a .git file: '%s'"
msgstr "demasiado grande para ser um ficheiro .git: '%s'"
-#: setup.c:704
+#: setup.c:705
#, fuzzy, c-format
msgid "error reading %s"
msgstr "Erro ao rematar %s."
-#: setup.c:706
+#: setup.c:707
#, fuzzy, c-format
msgid "invalid gitfile format: %s"
msgstr "formato de data inválido: %s"
-#: setup.c:708
+#: setup.c:709
#, fuzzy, c-format
msgid "no path in gitfile: %s"
msgstr "gitfile sem path: %s"
-#: setup.c:710
+#: setup.c:711
#, fuzzy, c-format
msgid "not a git repository: %s"
msgstr "é repositório git nenhum: %s"
-#: setup.c:812
+#: setup.c:813
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:826
+#: setup.c:827
#, fuzzy, c-format
msgid "not a git repository: '%s'"
msgstr "é repositório git nenhum: '%s'"
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:856 setup.c:858 setup.c:889
#, fuzzy, c-format
msgid "cannot chdir to '%s'"
msgstr "incapaz chdir para '%s'"
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
#, fuzzy
msgid "cannot come back to cwd"
msgstr "incapaz de voltar para cwd"
-#: setup.c:987
+#: setup.c:988
#, fuzzy, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "falha ao invocar stat de '%s'"
-#: setup.c:1225
+#: setup.c:1231
msgid "Unable to read current working directory"
msgstr "Incapaz de ler pasta atual de trabalho"
-#: setup.c:1234 setup.c:1240
+#: setup.c:1240 setup.c:1246
#, fuzzy, c-format
msgid "cannot change to '%s'"
msgstr "incapaz mudar para '%s'"
-#: setup.c:1245
+#: setup.c:1251
#, fuzzy, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "é repositório git nenhum (ou em pastas parente nenhuma): %s"
-#: setup.c:1251
+#: setup.c:1257
#, fuzzy, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -8602,7 +8634,7 @@ msgstr ""
"Parando na fronteira do sistema de ficheiros "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)."
-#: setup.c:1370
+#: setup.c:1381
#, fuzzy, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8611,31 +8643,31 @@ 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:1417
+#: setup.c:1430
#, fuzzy
msgid "open /dev/null or dup failed"
msgstr "falha ao abrir /dev/null"
-#: setup.c:1432
+#: setup.c:1445
#, fuzzy
msgid "fork failed"
msgstr "falha ao invocar fseek"
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
#, fuzzy
msgid "setsid failed"
msgstr "falha ao executar o comando stash"
-#: sparse-index.c:151
+#: sparse-index.c:162
msgid "attempting to use sparse-index without cone mode"
msgstr ""
-#: sparse-index.c:156
+#: sparse-index.c:174
#, fuzzy
msgid "unable to update cache-tree, staying full"
msgstr "incapaz atualizar árvore de cache"
-#: sparse-index.c:239
+#: sparse-index.c:261
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
@@ -8692,7 +8724,7 @@ msgid_plural "%u bytes/s"
msgstr[0] "bytes"
msgstr[1] "bytes"
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
+#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
#: builtin/rebase.c:866
#, c-format
msgid "could not open '%s' for writing"
@@ -8763,19 +8795,19 @@ msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
msgid "bad --ignore-submodules argument: %s"
msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
-#: submodule.c:818
+#: submodule.c:805
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-#: submodule.c:921
+#: submodule.c:908
#, 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:1006
+#: submodule.c:993
#, fuzzy, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8784,36 +8816,36 @@ msgstr ""
"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' "
"emsubmódulo %s"
-#: submodule.c:1129
+#: submodule.c:1116
#, fuzzy, c-format
msgid "process for submodule '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
-#: submodule.c:1169
+#: submodule.c:1156
#, fuzzy, c-format
msgid "Pushing submodule '%s'\n"
msgstr "A ignorar submódulo '%s'\n"
-#: submodule.c:1172
+#: submodule.c:1159
#, fuzzy, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossível enviar submódulo '%s'\n"
-#: submodule.c:1464
+#: submodule.c:1451
#, fuzzy, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Buscando submódulo %s%s\n"
-#: submodule.c:1498
+#: submodule.c:1485
#, fuzzy, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Submódulo '%s' inacessível\n"
-#: submodule.c:1653
+#: submodule.c:1640
#, fuzzy, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8822,79 +8854,79 @@ msgstr ""
"Erros na busca do submódulo:\n"
"%s"
-#: submodule.c:1678
+#: submodule.c:1665
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' é irreconhecível como um repositório git"
-#: submodule.c:1695
+#: submodule.c:1682
#, 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:1736
+#: submodule.c:1723
#, fuzzy, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' falhou no submódulo '%s'"
-#: submodule.c:1811
+#: submodule.c:1798
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "incapaz iniciar 'git status' no submódulo '%s'"
-#: submodule.c:1824
+#: submodule.c:1811
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "incapaz executar 'git status' no submódulo '%s'"
-#: submodule.c:1839
+#: submodule.c:1826
#, 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:1866 submodule.c:2176
+#: submodule.c:1853 submodule.c:2163
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "incapaz percorrer recursivamente o submódulo '%s'"
-#: submodule.c:1887
+#: submodule.c:1874
#, fuzzy
msgid "could not reset submodule index"
msgstr "incapaz repor index de submódulo"
-#: submodule.c:1929
+#: submodule.c:1916
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "o submódulo '%s' tem índice sujo"
-#: submodule.c:1981
+#: submodule.c:1968
#, fuzzy, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' incapaz de ser atualizado."
-#: submodule.c:2049
+#: submodule.c:2036
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
-#: submodule.c:2070
+#: submodule.c:2057
#, 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:2082 submodule.c:2141
+#: submodule.c:2069 submodule.c:2128
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "incapaz procurar nome para submódulo '%s'"
-#: submodule.c:2086
+#: submodule.c:2073
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
-#: submodule.c:2093
+#: submodule.c:2080
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8905,11 +8937,11 @@ msgstr ""
"'%s' para\n"
"'%s'\n"
-#: submodule.c:2221
+#: submodule.c:2208
msgid "could not start ls-files in .."
msgstr "incapaz iniciar ls-files em .."
-#: submodule.c:2261
+#: submodule.c:2248
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree retornou código de retorno inesperado %d"
@@ -8946,7 +8978,7 @@ msgstr "token terminador vazio no terminador '%.*s'"
msgid "could not read input file '%s'"
msgstr "incapaz ler ficheiro de entrada '%s'"
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
msgid "could not read from stdin"
msgstr "incapaz ler da entrada padrão"
@@ -9038,7 +9070,7 @@ msgstr ""
msgid "invalid remote service path"
msgstr "referência inválida: %s"
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1477
#, fuzzy
msgid "operation not supported by protocol"
msgstr "opção insustentado pelo protocolo"
@@ -9048,7 +9080,7 @@ msgstr "opção insustentado pelo protocolo"
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:400
msgid "--negotiate-only requires protocol v2"
msgstr ""
@@ -9181,48 +9213,48 @@ msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
msgid "could not read bundle '%s'"
msgstr "incapaz ler conjunto '%s'"
-#: transport.c:220
+#: transport.c:223
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transporte: opção de profundidade '%s' inválida"
-#: transport.c:272
+#: transport.c:275
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:273
+#: transport.c:276
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:400
+#: transport.c:403
#, fuzzy
msgid "server does not support wait-for-done"
msgstr "Servidor insustenta --deepen"
-#: transport.c:751
+#: transport.c:755
#, fuzzy
msgid "could not parse transport.color.* config"
msgstr "incapaz processar config transport.color.*"
-#: transport.c:826
+#: transport.c:830
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:960
+#: transport.c:965
#, fuzzy, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconhecido '%s' da chave '%s'"
-#: transport.c:1026
+#: transport.c:1031
#, fuzzy, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' proibido"
-#: transport.c:1079
+#: transport.c:1084
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1181
+#: transport.c:1187
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -9231,7 +9263,7 @@ msgstr ""
"Os seguintes paths de submódulo contêm alterações que\n"
"puderam ser encontradas em remoto nenhum:\n"
-#: transport.c:1185
+#: transport.c:1191
#, c-format
msgid ""
"\n"
@@ -9258,11 +9290,11 @@ msgstr ""
"para publicá-las no remoto.\n"
"\n"
-#: transport.c:1193
+#: transport.c:1199
msgid "Aborting."
msgstr "Abortado."
-#: transport.c:1340
+#: transport.c:1346
#, fuzzy
msgid "failed to push all needed submodules"
msgstr "Falha ao adicionar o submódulo '$sm_path'"
@@ -9532,12 +9564,12 @@ msgid ""
"colliding group is in the working tree:\n"
msgstr ""
-#: unpack-trees.c:1519
+#: unpack-trees.c:1618
#, fuzzy
msgid "Updating index flags"
msgstr "A atualizar %s"
-#: unpack-trees.c:2608
+#: unpack-trees.c:2707
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
@@ -9580,109 +9612,109 @@ msgstr "segmento de caminho '..' inválido"
msgid "Fetching objects"
msgstr "A verificar objetos"
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:236 builtin/am.c:2152
#, c-format
msgid "failed to read '%s'"
msgstr "falha ao ler '%s'"
-#: worktree.c:304
+#: worktree.c:303
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:315
+#: worktree.c:314
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:327
+#: worktree.c:326
#, fuzzy, c-format
msgid "'%s' does not exist"
msgstr "'%s' é inexistente"
-#: worktree.c:333
+#: worktree.c:332
#, 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:342
+#: worktree.c:341
#, fuzzy, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' aponta para algo diferente de '%s'"
-#: worktree.c:608
+#: worktree.c:603
#, fuzzy
msgid "not a directory"
msgstr "é pasta nenhuma"
-#: worktree.c:617
+#: worktree.c:612
#, fuzzy
msgid ".git is not a file"
msgstr "git show %s: ficheiro incorreto"
-#: worktree.c:619
+#: worktree.c:614
msgid ".git file broken"
msgstr ""
-#: worktree.c:621
+#: worktree.c:616
#, fuzzy
msgid ".git file incorrect"
msgstr "ficheiro de índice corrompido"
-#: worktree.c:727
+#: worktree.c:722
#, fuzzy
msgid "not a valid path"
msgstr "nome de objeto inválido: %s"
-#: worktree.c:733
+#: worktree.c:728
#, fuzzy
msgid "unable to locate repository; .git is not a file"
msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
-#: worktree.c:737
+#: worktree.c:732
#, 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
+#: worktree.c:736
#, fuzzy
msgid "unable to locate repository; .git file broken"
msgstr "incapaz localizar repositório; .git está quebrado"
-#: worktree.c:747
+#: worktree.c:742
msgid "gitdir unreadable"
msgstr ""
-#: worktree.c:751
+#: worktree.c:746
msgid "gitdir incorrect"
msgstr ""
-#: worktree.c:776
+#: worktree.c:771
#, fuzzy
msgid "not a valid directory"
msgstr "nome de objeto inválido: %s"
-#: worktree.c:782
+#: worktree.c:777
#, fuzzy
msgid "gitdir file does not exist"
msgstr "ficheiro gitdir é inexistente"
-#: worktree.c:787 worktree.c:796
+#: worktree.c:782 worktree.c:791
#, fuzzy, c-format
msgid "unable to read gitdir file (%s)"
msgstr "incapaz ler ficheiro gitdir (%s)"
-#: worktree.c:806
+#: worktree.c:801
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
-#: worktree.c:814
+#: worktree.c:809
#, fuzzy
msgid "invalid gitdir file"
msgstr "linha de Data inválida"
-#: worktree.c:822
+#: worktree.c:817
#, fuzzy
msgid "gitdir file points to non-existent location"
msgstr ""
@@ -9735,11 +9767,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:1075
+#: wt-status.c:211 wt-status.c:1125
msgid "Changes to be committed:"
msgstr "Alterações para serem submetidas:"
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1134
msgid "Changes not staged for commit:"
msgstr "Alterações por preparar para commit:"
@@ -9842,22 +9874,22 @@ msgstr "conteúdo modificado, "
msgid "untracked content, "
msgstr "conteúdo por seguir, "
-#: wt-status.c:908
+#: wt-status.c:958
#, 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:939
+#: wt-status.c:989
msgid "Submodules changed but not updated:"
msgstr "Submódulos alterados mas desatualizados:"
-#: wt-status.c:941
+#: wt-status.c:991
msgid "Submodule changes to be committed:"
msgstr "Alterações em submódulos para serem submetidas:"
-#: wt-status.c:1023
+#: wt-status.c:1073
#, fuzzy
msgid ""
"Do not modify or remove the line above.\n"
@@ -9866,7 +9898,7 @@ msgstr ""
"Deixe estar a linha acima.\n"
"Tudo abaixo será ignorado."
-#: wt-status.c:1115
+#: wt-status.c:1165
#, c-format
msgid ""
"\n"
@@ -9874,108 +9906,108 @@ msgid ""
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: wt-status.c:1145
+#: wt-status.c:1195
msgid "You have unmerged paths."
msgstr "Tens paths por juntar."
-#: wt-status.c:1148
+#: wt-status.c:1198
msgid " (fix conflicts and run \"git commit\")"
msgstr " (corrija os conflitos e execute \"git commit\")"
-#: wt-status.c:1150
+#: wt-status.c:1200
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (use \"git am --abort\" para abortar a integração)"
-#: wt-status.c:1154
+#: wt-status.c:1204
msgid "All conflicts fixed but you are still merging."
msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-#: wt-status.c:1157
+#: wt-status.c:1207
msgid " (use \"git commit\" to conclude merge)"
msgstr " (use \"git commit\" para concluir a integração)"
-#: wt-status.c:1166
+#: wt-status.c:1216
msgid "You are in the middle of an am session."
msgstr "Sessão am em curso."
-#: wt-status.c:1169
+#: wt-status.c:1219
msgid "The current patch is empty."
msgstr "O patch atual está vazio."
-#: wt-status.c:1173
+#: wt-status.c:1223
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (corrija os conflitos e execute \"git am --continue\")"
-#: wt-status.c:1175
+#: wt-status.c:1225
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:1177
+#: wt-status.c:1227
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (use \"git am --abort\" para restaurar o ramo original)"
-#: wt-status.c:1310
+#: wt-status.c:1360
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo está faltando."
-#: wt-status.c:1312
+#: wt-status.c:1362
msgid "No commands done."
msgstr "Nenhum comando concluído."
-#: wt-status.c:1315
+#: wt-status.c:1365
#, 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:1326
+#: wt-status.c:1376
#, c-format
msgid " (see more in file %s)"
msgstr " (veja mais no ficheiro %s)"
-#: wt-status.c:1331
+#: wt-status.c:1381
msgid "No commands remaining."
msgstr "Nenhum comando por concluir."
-#: wt-status.c:1334
+#: wt-status.c:1384
#, 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:1342
+#: wt-status.c:1392
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
-#: wt-status.c:1354
+#: wt-status.c:1404
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
-#: wt-status.c:1359
+#: wt-status.c:1409
msgid "You are currently rebasing."
msgstr "Está a rebasear neste momento."
-#: wt-status.c:1372
+#: wt-status.c:1422
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrija os conflitos e execute \"git rebase --continue\")"
-#: wt-status.c:1374
+#: wt-status.c:1424
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: wt-status.c:1376
+#: wt-status.c:1426
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
-#: wt-status.c:1383
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
-#: wt-status.c:1387
+#: wt-status.c:1437
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9983,166 +10015,171 @@ msgstr ""
"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
"sobre '%s'."
-#: wt-status.c:1392
+#: wt-status.c:1442
msgid "You are currently splitting a commit during a rebase."
msgstr "Está a dividir um commit durante um rebase."
-#: wt-status.c:1395
+#: wt-status.c:1445
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:1399
+#: wt-status.c:1449
#, 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:1404
+#: wt-status.c:1454
msgid "You are currently editing a commit during a rebase."
msgstr "Está a editar um commit durante um rebase."
-#: wt-status.c:1407
+#: wt-status.c:1457
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (use \"git commit --amend\" para emendar o commit atual)"
-#: wt-status.c:1409
+#: wt-status.c:1459
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:1420
+#: wt-status.c:1470
#, fuzzy
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick atualmente em curso"
-#: wt-status.c:1423
+#: wt-status.c:1473
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Está a realizar cherry-pick do commit %s."
-#: wt-status.c:1430
+#: wt-status.c:1480
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: wt-status.c:1433
+#: wt-status.c:1483
#, fuzzy
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")"
-#: wt-status.c:1436
+#: wt-status.c:1486
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1438
+#: wt-status.c:1488
#, fuzzy
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:1440
+#: wt-status.c:1490
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:1450
+#: wt-status.c:1500
#, fuzzy
msgid "Revert currently in progress."
msgstr "abortar integração em curso"
-#: wt-status.c:1453
+#: wt-status.c:1503
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Está a reverter o commit %s neste comento."
-#: wt-status.c:1459
+#: wt-status.c:1509
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: wt-status.c:1462
+#: wt-status.c:1512
#, fuzzy
msgid " (run \"git revert --continue\" to continue)"
msgstr " (corrija dos conflitos e execute \"git revert --continue\")"
-#: wt-status.c:1465
+#: wt-status.c:1515
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
-#: wt-status.c:1467
+#: wt-status.c:1517
#, fuzzy
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (use \"git rebase --skip\" para ignorar este patch)"
-#: wt-status.c:1469
+#: wt-status.c:1519
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:1479
+#: wt-status.c:1529
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
-#: wt-status.c:1483
+#: wt-status.c:1533
msgid "You are currently bisecting."
msgstr "Está a bissetar neste momento."
-#: wt-status.c:1486
+#: wt-status.c:1536
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:1497
+#: wt-status.c:1547
+#, fuzzy
+msgid "You are in a sparse checkout."
+msgstr "falha ao finalizar integração de notas"
+
+#: wt-status.c:1550
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr ""
-#: wt-status.c:1736
+#: wt-status.c:1794
msgid "On branch "
msgstr "No ramo "
-#: wt-status.c:1743
+#: wt-status.c:1801
msgid "interactive rebase in progress; onto "
msgstr "rebase interativo em curso; sobre "
-#: wt-status.c:1745
+#: wt-status.c:1803
msgid "rebase in progress; onto "
msgstr "rebase em curso; sobre "
-#: wt-status.c:1750
+#: wt-status.c:1808
msgid "HEAD detached at "
msgstr "HEAD destacada em "
-#: wt-status.c:1752
+#: wt-status.c:1810
msgid "HEAD detached from "
msgstr "HEAD destacada de "
-#: wt-status.c:1755
+#: wt-status.c:1813
msgid "Not currently on any branch."
msgstr "Atualmente em ramo nenhum."
-#: wt-status.c:1772
+#: wt-status.c:1830
msgid "Initial commit"
msgstr "Memória inicial"
-#: wt-status.c:1773
+#: wt-status.c:1831
#, fuzzy
msgid "No commits yet"
msgstr "Ainda commits nenhuns"
-#: wt-status.c:1787
+#: wt-status.c:1845
msgid "Untracked files"
msgstr "Ficheiros por seguir"
-#: wt-status.c:1789
+#: wt-status.c:1847
msgid "Ignored files"
msgstr "Ficheiros ignorados"
-#: wt-status.c:1793
+#: wt-status.c:1851
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10153,32 +10190,32 @@ msgstr ""
"'status -uno' pode-o acelerar, mas tens de te lembrar de adicionares\n"
"os novos ficheiros (vê 'git help status')."
-#: wt-status.c:1799
+#: wt-status.c:1857
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ficheiros por seguir fora da listagem%s"
-#: wt-status.c:1801
+#: wt-status.c:1859
msgid " (use -u option to show untracked files)"
msgstr " (usa opção -u para mostrar ficheiros por seguir)"
-#: wt-status.c:1807
+#: wt-status.c:1865
msgid "No changes"
msgstr "Sem alterações"
-#: wt-status.c:1812
+#: wt-status.c:1870
#, 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"
-#: wt-status.c:1816
+#: wt-status.c:1874
#, c-format
msgid "no changes added to commit\n"
msgstr "foi adicionado a commit alteração nenhuma\n"
-#: wt-status.c:1820
+#: wt-status.c:1878
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -10187,83 +10224,83 @@ msgstr ""
"nada adicionado para commit mas há ficheiros por seguir presentes (usa(\"git "
"add\" para seguir)\n"
-#: wt-status.c:1824
+#: wt-status.c:1882
#, 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:1828
+#: wt-status.c:1886
#, 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:1832 wt-status.c:1838
+#: wt-status.c:1890 wt-status.c:1896
#, c-format
msgid "nothing to commit\n"
msgstr "nada a commit\n"
-#: wt-status.c:1835
+#: wt-status.c:1893
#, 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:1840
+#: wt-status.c:1898
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada a commitar, worktree limpa\n"
-#: wt-status.c:1945
+#: wt-status.c:2003
#, fuzzy
msgid "No commits yet on "
msgstr "Nenhum comando concluído."
-#: wt-status.c:1949
+#: wt-status.c:2007
msgid "HEAD (no branch)"
msgstr "HEAD (ramo nenhum)"
-#: wt-status.c:1980
+#: wt-status.c:2038
msgid "different"
msgstr "diferente"
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2040 wt-status.c:2048
msgid "behind "
msgstr "atrás "
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2043 wt-status.c:2046
msgid "ahead "
msgstr "à frente "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2569
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "incapaz efetuar %s: Tens alterações despreparadas."
-#: wt-status.c:2517
+#: wt-status.c:2575
msgid "additionally, your index contains uncommitted changes."
msgstr "além disso, teu index contém alterações por memorizar."
-#: wt-status.c:2519
+#: wt-status.c:2577
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "incapaz efetuar %s: teu index contém alterações por memorizar."
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:182
#, fuzzy
msgid "could not send IPC command"
msgstr "incapaz encontrar commit %s"
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:189
#, fuzzy
msgid "could not read IPC response"
msgstr "incapaz de ler ref %s"
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: compat/simple-ipc/ipc-unix-socket.c:866
#, 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
+#: compat/simple-ipc/ipc-unix-socket.c:878
#, fuzzy, c-format
msgid "could not start worker[0] for '%s'"
msgstr "incapaz analisar log para '%s'"
@@ -10300,7 +10337,7 @@ msgstr "remove '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Alterações despreparadas após refrescar index:"
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:307 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "Incapaz ler o index"
@@ -10335,8 +10372,8 @@ msgstr "Impossível submeter '%s'"
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: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/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
msgid "dry run"
msgstr "simular ação"
@@ -10466,13 +10503,13 @@ 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
+#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
#, fuzzy
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--patch é incompatível com --{hard,mixed,soft}"
#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
+#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
@@ -10488,108 +10525,108 @@ msgid ""
"\"git config advice.addEmptyPathspec false\""
msgstr ""
-#: builtin/am.c:364
+#: builtin/am.c:365
msgid "could not parse author script"
msgstr "incapaz processar script de autor"
-#: builtin/am.c:454
+#: builtin/am.c:455
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' foi eliminado pelo hook applypatch-msg"
-#: builtin/am.c:496
+#: builtin/am.c:497
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Linha de entrada malformada: '%s'."
-#: builtin/am.c:534
+#: builtin/am.c:535
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Falha ao copiar notas de '%s' para '%s'"
-#: builtin/am.c:560
+#: builtin/am.c:561
msgid "fseek failed"
msgstr "falha de fseek"
-#: builtin/am.c:748
+#: builtin/am.c:749
#, c-format
msgid "could not parse patch '%s'"
msgstr "incapaz processar patch '%s'"
-#: builtin/am.c:813
+#: builtin/am.c:814
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:861
+#: builtin/am.c:862
msgid "invalid timestamp"
msgstr "carimbo de data/hora inválido"
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:867 builtin/am.c:879
msgid "invalid Date line"
msgstr "linha de Data inválida"
-#: builtin/am.c:873
+#: builtin/am.c:874
msgid "invalid timezone offset"
msgstr "mudança de fuso horário inválida"
-#: builtin/am.c:966
+#: builtin/am.c:967
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:972 builtin/clone.c:414
#, c-format
msgid "failed to create directory '%s'"
msgstr "falha ao criar o diretório '%s'"
-#: builtin/am.c:976
+#: builtin/am.c:977
msgid "Failed to split patches."
msgstr "Falha ao dividir patches."
-#: builtin/am.c:1125
+#: builtin/am.c:1126
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Após resolver este problema, execute \"%s --continue\"."
-#: builtin/am.c:1126
+#: builtin/am.c:1127
#, 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:1127
+#: builtin/am.c:1128
#, 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:1222
+#: builtin/am.c:1223
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1250
+#: builtin/am.c:1251
#, fuzzy
msgid "Patch is empty."
msgstr "O patch atual está vazio."
-#: builtin/am.c:1315
+#: builtin/am.c:1316
#, fuzzy, c-format
msgid "missing author line in commit %s"
msgstr "Autor em falta: %s"
-#: builtin/am.c:1318
+#: builtin/am.c:1319
#, fuzzy, c-format
msgid "invalid ident line: %.*s"
msgstr "linha de identidade inválida: %s"
-#: builtin/am.c:1537
+#: builtin/am.c:1538
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:1539
+#: builtin/am.c:1540
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:1558
+#: builtin/am.c:1559
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -10597,26 +10634,26 @@ msgstr ""
"Editaste o patch manualmente?\n"
"No registo de index, aplica-se a blobs nenhuns."
-#: builtin/am.c:1564
+#: builtin/am.c:1565
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:1590
+#: builtin/am.c:1591
msgid "Failed to merge in the changes."
msgstr "Falha ao integrar as alterações."
-#: builtin/am.c:1622
+#: builtin/am.c:1623
msgid "applying to an empty history"
msgstr "a aplicar a um histórico vazio"
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1675 builtin/am.c:1679
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "incapaz continuar: %s é inexistente."
-#: builtin/am.c:1696
+#: builtin/am.c:1697
msgid "Commit Body is:"
msgstr "Corpo do commit:"
@@ -10624,39 +10661,39 @@ msgstr "Corpo do commit:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1706
+#: builtin/am.c:1707
#, 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:1752 builtin/commit.c:408
+#: builtin/am.c:1753 builtin/commit.c:408
msgid "unable to write index file"
msgstr "incapaz escrever ficheiro de index"
-#: builtin/am.c:1756
+#: builtin/am.c:1757
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sujo: incapaz aplicar patches (sujo: %s)"
-#: builtin/am.c:1796 builtin/am.c:1864
+#: builtin/am.c:1797 builtin/am.c:1865
#, c-format
msgid "Applying: %.*s"
msgstr "A aplicar: %.*s"
-#: builtin/am.c:1813
+#: builtin/am.c:1814
msgid "No changes -- Patch already applied."
msgstr "Nenhuma alteração -- Já foi aplicado o patch."
-#: builtin/am.c:1819
+#: builtin/am.c:1820
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Falha ao aplicar o patch em %s %.*s"
-#: builtin/am.c:1823
+#: builtin/am.c:1824
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1867
+#: builtin/am.c:1868
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10666,7 +10703,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:1874
+#: builtin/am.c:1875
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10674,17 +10711,17 @@ msgid ""
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
+#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Incapaz analisar objeto '%s'."
-#: builtin/am.c:2033
+#: builtin/am.c:2034
msgid "failed to clean index"
msgstr "falha ao limpar o índice"
-#: builtin/am.c:2077
+#: builtin/am.c:2078
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10692,94 +10729,94 @@ msgstr ""
"Parece que moveste HEAD desde a última falha de 'am'.\n"
"Recusando rebobinar até ORIG_HEAD"
-#: builtin/am.c:2184
+#: builtin/am.c:2185
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2226
+#: builtin/am.c:2227
#, fuzzy, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2230
+#: builtin/am.c:2231
#, 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:2261
+#: builtin/am.c:2262
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2262
+#: builtin/am.c:2263
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/am.c:2268
+#: builtin/am.c:2269
msgid "run interactively"
msgstr "executar interativamente"
-#: builtin/am.c:2270
+#: builtin/am.c:2271
msgid "historical option -- no-op"
msgstr "opção histórica -- sem-ação"
-#: builtin/am.c:2272
+#: builtin/am.c:2273
msgid "allow fall back on 3way merging if needed"
msgstr "permitir recorrer a integração com 3 pontos se necessário"
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:472 builtin/stash.c:945
msgid "be quiet"
msgstr "silencioso"
-#: builtin/am.c:2275
+#: builtin/am.c:2276
#, 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:2278
+#: builtin/am.c:2279
msgid "recode into utf8 (default)"
msgstr "recodificar em utf8 (predefinição)"
-#: builtin/am.c:2280
+#: builtin/am.c:2281
msgid "pass -k flag to git-mailinfo"
msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/am.c:2282
+#: builtin/am.c:2283
msgid "pass -b flag to git-mailinfo"
msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/am.c:2284
+#: builtin/am.c:2285
msgid "pass -m flag to git-mailinfo"
msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/am.c:2286
+#: builtin/am.c:2287
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:2289
+#: builtin/am.c:2290
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"
-#: builtin/am.c:2292
+#: builtin/am.c:2293
msgid "strip everything before a scissors line"
msgstr "retirar todo o conteúdo antes da linha de tesoura"
-#: builtin/am.c:2294
+#: builtin/am.c:2295
#, 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
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
+#: builtin/am.c:2325
msgid "pass it through git-apply"
msgstr "transmitir ao git-apply"
-#: 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/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
#: 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
@@ -10788,69 +10825,69 @@ msgstr "transmitir ao git-apply"
msgid "n"
msgstr "n"
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
+#: builtin/am.c:2321 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:2321
+#: builtin/am.c:2322
msgid "format the patch(es) are in"
msgstr "formato de apresentação de patches"
-#: builtin/am.c:2327
+#: builtin/am.c:2328
msgid "override error message when patch failure occurs"
msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
-#: builtin/am.c:2329
+#: builtin/am.c:2330
msgid "continue applying patches after resolving a conflict"
msgstr "continuar a aplicar os patches depois de resolver os conflitos"
-#: builtin/am.c:2332
+#: builtin/am.c:2333
msgid "synonyms for --continue"
msgstr "sinónimo de --continue"
-#: builtin/am.c:2335
+#: builtin/am.c:2336
msgid "skip the current patch"
msgstr "ignorar o patch atual"
-#: builtin/am.c:2338
+#: builtin/am.c:2339
#, 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:2341
+#: builtin/am.c:2342
msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2345
+#: builtin/am.c:2346
#, fuzzy
msgid "show the patch being applied"
msgstr "mostrar linhas sendo submetidas"
-#: builtin/am.c:2350
+#: builtin/am.c:2351
msgid "lie about committer date"
msgstr "mentir sobre a data de commit"
-#: builtin/am.c:2352
+#: builtin/am.c:2353
msgid "use current timestamp for author date"
msgstr "usar a data e hora atual como data de autor"
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
+#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
msgid "GPG-sign commits"
msgstr "assinar os commits com GPG"
-#: builtin/am.c:2358
+#: builtin/am.c:2359
msgid "(internal use for git-rebase)"
msgstr "(uso interno de git-rebase)"
-#: builtin/am.c:2376
+#: builtin/am.c:2377
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."
@@ -10858,17 +10895,17 @@ msgstr ""
"A opção -b/--binary há muito que é ignorada e será removida.\n"
"Por favor deixa de usá-la."
-#: builtin/am.c:2383
+#: builtin/am.c:2384
msgid "failed to read the index"
msgstr "falha ao ler o índice"
-#: builtin/am.c:2398
+#: builtin/am.c:2399
#, 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:2422
+#: builtin/am.c:2423
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10877,11 +10914,11 @@ msgstr ""
"Diretório abandonado %s encontrado.\n"
"Use \"git am --abort\" para o remover."
-#: builtin/am.c:2428
+#: builtin/am.c:2429
msgid "Resolve operation not in progress, we are not resuming."
msgstr "A operação de resolução está parada, continuará parada."
-#: builtin/am.c:2438
+#: builtin/am.c:2439
msgid "interactive mode requires patches on the command line"
msgstr ""
@@ -10980,64 +11017,64 @@ msgstr "incapaz abrir ficheiro '%s' em modo '%s'"
msgid "could not write to file '%s'"
msgstr "incapaz escrever para ficheiro '%s'"
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:155
#, fuzzy, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' é um termo inválido."
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:159
#, 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:167
+#: builtin/bisect--helper.c:169
#, 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:177
+#: builtin/bisect--helper.c:179
msgid "please use two different terms"
msgstr "por favor, usa dois termos diferentes"
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:195
#, fuzzy, c-format
msgid "We are not bisecting.\n"
msgstr "Estamos bissetando nada.\n"
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:203
#, fuzzy, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' é um commit inválido"
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:212
#, 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:254
+#: builtin/bisect--helper.c:256
#, fuzzy, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Argumento de bisect_write incorreto: $state"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:261
#, fuzzy, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "incapaz obter oid da rev '%s'"
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:273
#, fuzzy, c-format
msgid "couldn't open the file '%s'"
msgstr "incapaz abrir o ficheiro '%s'"
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:299
#, 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:324
+#: builtin/bisect--helper.c:326
#, fuzzy, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -11046,7 +11083,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:328
+#: builtin/bisect--helper.c:330
#, fuzzy, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -11057,7 +11094,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:348
+#: builtin/bisect--helper.c:350
#, fuzzy, c-format
msgid "bisecting only with a %s commit"
msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
@@ -11066,22 +11103,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:356
+#: builtin/bisect--helper.c:358
msgid "Are you sure [Y/n]? "
msgstr "Tem a certeza [Y/n]? "
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:419
msgid "no terms defined"
msgstr "termo nenhum definido"
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:422
#, 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:430
+#: builtin/bisect--helper.c:432
#, fuzzy, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -11090,57 +11127,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:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
#, fuzzy
msgid "revision walk setup failed\n"
msgstr "falha ao configurar percurso de revisões\n"
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:521
#, fuzzy, c-format
msgid "could not open '%s' for appending"
msgstr "incapaz abrir '%s' para acrescentar"
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
#, fuzzy
msgid "'' is not a valid term"
msgstr "'' é um termo inválido"
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:663
#, fuzzy, c-format
msgid "unrecognized option: '%s'"
msgstr "opção desconhecida: '%s'"
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:667
#, 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:696
+#: builtin/bisect--helper.c:698
#, fuzzy
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorreta - é necessário uma HEAD"
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:713
#, 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:732
+#: builtin/bisect--helper.c:734
msgid "won't bisect on cg-seek'ed tree"
msgstr "incapaz bissetar numa árvore \"cg-seek'ada\""
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:737
#, fuzzy
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorreta - referência simbólica desconhecida"
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:757
#, fuzzy, c-format
msgid "invalid ref: '%s'"
msgstr "ficheiro inválido: '%s'"
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:815
#, fuzzy
msgid "You need to start by \"git bisect start\"\n"
msgstr "Deve começar por executar \"git bisect start\"\n"
@@ -11149,113 +11186,113 @@ 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:824
+#: builtin/bisect--helper.c:826
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:842
+#: builtin/bisect--helper.c:844
#, fuzzy
msgid "Please call `--bisect-state` with at least one argument"
msgstr "Invoque 'bisect_state' com pelo menos um argumento."
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:857
#, 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:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
#, fuzzy, c-format
msgid "Bad rev input: %s"
msgstr "Revisão incorreta na entrada: $arg"
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:889
#, fuzzy, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "Revisão incorreta na entrada: $arg"
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:921
msgid "We are not bisecting."
msgstr "Estamos bissetando nada."
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:971
#, fuzzy, c-format
msgid "'%s'?? what are you talking about?"
msgstr "?? de que é que estás a falar?"
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:983
#, fuzzy, c-format
msgid "cannot read file '%s' for replaying"
msgstr "incapaz ler $file para reproduzir"
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1056
#, fuzzy
msgid "reset the bisection state"
msgstr "remover uma secção: nome"
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1058
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1060
#, fuzzy
msgid "print out the bisect terms"
msgstr "imprimir apenas as tags do objeto"
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1062
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1064
#, fuzzy
msgid "find the next bisection commit"
msgstr "encontra próximo commit de bisecção"
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1066
msgid "mark the state of ref (or refs)"
msgstr ""
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1068
#, fuzzy
msgid "list the bisection steps so far"
msgstr "remover uma secção: nome"
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1070
msgid "replay the bisection process from the given file"
msgstr ""
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1072
#, fuzzy
msgid "skip some commits for checkout"
msgstr "'%s' tem commit checked out nenhum"
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1074
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1089
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:1092
+#: builtin/bisect--helper.c:1094
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1100
#, fuzzy
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ":strip= requer um inteiro positivo como argumento"
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1109
#, fuzzy
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next requer 0 argumentos"
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1120
#, fuzzy
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-next requer 0 argumentos"
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1125
#, fuzzy
msgid "no logfile given"
msgstr "Nenhum ficheiro de log fornecido"
@@ -11316,7 +11353,7 @@ msgstr "Mostrar estatísticas de custo de atividade"
#: 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
+#: builtin/push.c:566 builtin/send-pack.c:198
msgid "force progress reporting"
msgstr "forçar informação de progresso"
@@ -11376,7 +11413,7 @@ msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
msgid "ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:883 builtin/log.c:1823
#, fuzzy
msgid "rev"
msgstr "reverter"
@@ -11982,19 +12019,19 @@ msgstr ""
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
msgid "do not show progress meter"
msgstr "mostrar medidor de progresso nenhum"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
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:3754
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
@@ -12006,30 +12043,30 @@ msgstr ""
msgid "Need a repository to create a bundle."
msgstr "É necessário um repositório para criar um bundle."
-#: builtin/bundle.c:107
+#: builtin/bundle.c:109
#, fuzzy
msgid "do not show bundle details"
msgstr "mostrar nenhuns detalhes de conjunto"
-#: builtin/bundle.c:122
+#: builtin/bundle.c:128
#, c-format
msgid "%s is okay\n"
msgstr "%s está ok\n"
-#: builtin/bundle.c:163
+#: builtin/bundle.c:179
msgid "Need a repository to unbundle."
msgstr "É preciso um repositório para desempacotar."
-#: builtin/bundle.c:171 builtin/remote.c:1700
+#: builtin/bundle.c:191 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "ser verboso; deve ser colocado antes de um subcomando"
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:213 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subcomando desconhecido: %s"
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:596
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12037,7 +12074,7 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:597
#, fuzzy
msgid ""
"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
@@ -12046,74 +12083,74 @@ msgstr ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:618
#, fuzzy
msgid "only one batch option may be specified"
msgstr "Nenhum nome de ramo especificado"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:636
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> pode ser um de: blob, tree, commit, tag"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:637
msgid "show object type"
msgstr "mostrar tipo do objeto"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:638
msgid "show object size"
msgstr "mostrar tamanho do objeto"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:640
msgid "exit with zero when there's no error"
msgstr "sair com retorno zero quando há erro nenhum"
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:641
msgid "pretty-print object's content"
msgstr "mostrar conteúdo do objeto com impressão bonita"
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:643
msgid "for blob objects, run textconv on object's content"
msgstr "executar textconv no conteúdo de objetos blob"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:645
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:646
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:647
msgid "use a specific path for --textconv/--filters"
msgstr "usar um caminho específico para --textconv/--filters"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:649
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos"
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:650
msgid "buffer --batch output"
msgstr "carregar a saída de --batch"
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:652
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão"
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:656
msgid "show info about objects fed from the standard input"
msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão"
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:660
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
"batch-check)"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:662
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos os objetos com --batch ou --batch-check"
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:664
msgid "do not order --batch-all-objects output"
msgstr ""
@@ -12142,7 +12179,7 @@ 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:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -12201,9 +12238,10 @@ 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
+#: 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:491
+#: builtin/worktree.c:728
msgid "string"
msgstr "cadeia"
@@ -12377,7 +12415,7 @@ msgstr "Incapaz fazer reflog para '%s': %s\n"
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "incapaz atualizar HEAD"
@@ -12507,7 +12545,7 @@ msgstr "esperava-se apenas uma referência, %d fornecidas."
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
@@ -12606,7 +12644,7 @@ msgstr "Falta um nome dum ramo; tente -b"
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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
msgid "style"
msgstr "estilo"
@@ -12697,7 +12735,7 @@ msgstr "git checkout: --detach recusa path '%s' como argumento"
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--first-parent é incompatível com --bisect"
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
+#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
#, fuzzy
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--first-parent é incompatível com --bisect"
@@ -12717,7 +12755,7 @@ msgstr "Deve especificar um diretório."
#: 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/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
#: builtin/worktree.c:486
msgid "branch"
msgstr "ramo"
@@ -12818,7 +12856,7 @@ msgstr "Ignoraria o repositório %s\n"
msgid "could not lstat %s\n"
msgstr "incapaz lstat %s\n"
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12831,7 +12869,7 @@ msgstr ""
"foo - selecionar item baseado no prefixo único\n"
" - (vazio) seleciona nada\n"
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12852,33 +12890,33 @@ msgstr ""
"* - escolher todos os itens\n"
" - (vazio) concluir seleção\n"
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "O quê (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduza padrões a ignorar>> "
-#: builtin/clean.c:696
+#: builtin/clean.c:693
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "AVISO: incapaz encontrar items correspondentes a: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:714
msgid "Select items to delete"
msgstr "Selecione itens para eliminar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Remover %s [y/N]? "
-#: builtin/clean.c:789
+#: builtin/clean.c:786
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12896,52 +12934,52 @@ msgstr ""
"help - esta ajuda\n"
"? - ajuda para seleção em linha de comandos"
-#: builtin/clean.c:825
+#: builtin/clean.c:822
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Removeria o seguinte item:"
msgstr[1] "Removeria os seguintes itens:"
-#: builtin/clean.c:841
+#: builtin/clean.c:838
msgid "No more files to clean, exiting."
msgstr "Mais ficheiro por limpar nenhum, saindo."
-#: builtin/clean.c:903
+#: builtin/clean.c:900
msgid "do not print names of files removed"
msgstr "incapaz imprimir nomes de ficheiros removidos"
-#: builtin/clean.c:905
+#: builtin/clean.c:902
msgid "force"
msgstr "forçar"
-#: builtin/clean.c:906
+#: builtin/clean.c:903
msgid "interactive cleaning"
msgstr "limpeza interativa"
-#: builtin/clean.c:908
+#: builtin/clean.c:905
msgid "remove whole directories"
msgstr "remover diretórios inteiros"
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
+#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:923 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"
-#: builtin/clean.c:910
+#: builtin/clean.c:907
msgid "add <pattern> to ignore rules"
msgstr "adicionar <padrão> às regras ignoradas"
-#: builtin/clean.c:911
+#: builtin/clean.c:908
msgid "remove ignored files, too"
msgstr "também remover ficheiros ignorados"
-#: builtin/clean.c:913
+#: builtin/clean.c:910
msgid "remove only ignored files"
msgstr "remover apenas ficheiros ignorados"
-#: builtin/clean.c:929
+#: builtin/clean.c:925
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12949,7 +12987,7 @@ msgstr ""
"clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
"recusando limpar"
-#: builtin/clean.c:932
+#: builtin/clean.c:928
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12957,7 +12995,7 @@ msgstr ""
"clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
"recusando limpar"
-#: builtin/clean.c:944
+#: builtin/clean.c:940
msgid "-x and -X cannot be used together"
msgstr "-x e -X incapazes de ser usados juntos"
@@ -12974,7 +13012,7 @@ msgstr "para clonar de um repositório local"
msgid "don't create a checkout"
msgstr "cria checkout nenhum"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "criar um repositório nu"
@@ -13006,26 +13044,26 @@ msgstr "inicializar submódulos no clone"
msgid "number of submodules cloned in parallel"
msgstr "número de submódulos clonados em paralelo"
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1834
-#: builtin/submodule--helper.c:2339
+#: builtin/clone.c:123 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
msgid "use --reference only while cloning"
msgstr "usar --reference apenas para clonar"
-#: 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
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
msgid "name"
msgstr "nome"
@@ -13042,7 +13080,7 @@ msgstr "extrair <ramo> em vez da HEAD do remoto"
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
#: builtin/pull.c:208
msgid "depth"
msgstr "profundidade"
@@ -13051,7 +13089,7 @@ msgstr "profundidade"
msgid "create a shallow clone of that depth"
msgstr "criar um clone raso com essa profundidade"
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
#: builtin/pull.c:211
msgid "time"
msgstr "hora"
@@ -13069,8 +13107,8 @@ msgstr "revisão"
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844
-#: builtin/submodule--helper.c:2353
+#: builtin/clone.c:137 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
@@ -13082,11 +13120,11 @@ msgstr ""
msgid "any cloned submodules will be shallow"
msgstr "qualquer submódulo clonado será raso"
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "separar o repositório git da árvore de trabalho"
@@ -13099,22 +13137,22 @@ msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
#: 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
+#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196
msgid "server-specific"
msgstr "específico do servidor"
#: 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
+#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "opção para transmitir"
#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
@@ -13217,7 +13255,7 @@ msgstr "incapaz reempacotar para limpar"
msgid "cannot unlink temporary alternates file"
msgstr "incapaz unlink ficheiro sobressalente temporário"
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
msgid "Too many arguments."
msgstr "Demasiados argumentos."
@@ -13239,7 +13277,7 @@ msgstr "--bare e --separate-git-dir são incompatíveis."
msgid "repository '%s' does not exist"
msgstr "repositório '%s' é inexistente"
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:1039 builtin/fetch.c:2014
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s é número positivo nenhum"
@@ -13260,7 +13298,7 @@ msgid "working tree '%s' already exists."
msgstr "a árvore de trabalho '%s' já existe."
#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "incapaz criar as pastas superiores de '%s'"
@@ -13317,12 +13355,16 @@ msgstr "o repositório de origem é raso, --local ignorado"
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr ""
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Ramo remoto %s por encontrar em upstream %s"
-#: builtin/clone.c:1348
+#: builtin/clone.c:1347
msgid "You appear to have cloned an empty repository."
msgstr "Parece foi clonado um repositório vazio."
@@ -13380,7 +13422,7 @@ 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:191 builtin/log.c:1776
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
msgid "dir"
msgstr "dir"
@@ -13473,7 +13515,7 @@ msgstr ""
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
#, fuzzy, c-format
msgid "not a valid object name %s"
msgstr "%s nome de objeto inválido"
@@ -13503,13 +13545,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:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
+#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
#: builtin/tag.c:456
msgid "message"
msgstr "mensagem"
-#: builtin/commit-tree.c:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
msgid "commit message"
msgstr "mensagem de commit"
@@ -13518,7 +13560,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:1631 builtin/merge.c:299
+#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
@@ -13665,7 +13707,7 @@ msgstr ""
"incapaz selecionar um carácter de comentário fica por usar\n"
"na mensagem de commit atual"
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
#, c-format
msgid "could not lookup commit %s"
msgstr "incapaz consultar commit %s"
@@ -13701,7 +13743,48 @@ msgstr "incapaz ler MERGE_MSG"
msgid "could not write commit template"
msgstr "incapaz escrever o modelo de commit"
-#: builtin/commit.c:900
+#: builtin/commit.c:893
+#, fuzzy, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Introduza a mensagem de commit das suas alterações.\n"
+"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
+"aborta o commit.\n"
+
+#: builtin/commit.c:895
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Introduza a mensagem de commit das suas alterações.\n"
+"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
+"aborta o commit.\n"
+
+#: builtin/commit.c:899
+#, fuzzy, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Introduzia a mensagem de commit das suas alterações.\n"
+"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:903
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Introduzia a mensagem de commit das suas alterações.\n"
+"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:915
#, fuzzy
msgid ""
"\n"
@@ -13716,7 +13799,7 @@ msgstr ""
"\tgit update-ref -d MERGE_HEAD\n"
"e tenta de novo.\n"
-#: builtin/commit.c:905
+#: builtin/commit.c:920
#, fuzzy
msgid ""
"\n"
@@ -13731,201 +13814,180 @@ msgstr ""
"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"e tenta de novo.\n"
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Introduza a mensagem de commit das suas alterações.\n"
-"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
-"aborta o commit.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Introduzia a mensagem de commit das suas alterações.\n"
-"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:940
+#: builtin/commit.c:947
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:948
+#: builtin/commit.c:955
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:955
+#: builtin/commit.c:962
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:973
+#: builtin/commit.c:980
msgid "Cannot read index"
msgstr "Incapaz ler index"
-#: builtin/commit.c:1018
+#: builtin/commit.c:1025
#, fuzzy
msgid "unable to pass trailers to --trailers"
msgstr "incapaz processar cabeçalho de %s"
-#: builtin/commit.c:1058
+#: builtin/commit.c:1065
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: builtin/commit.c:1079 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:1116
+#: builtin/commit.c:1123
#, 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"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1137
#, fuzzy, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo de ignorar inválido '%s'"
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1155 builtin/commit.c:1448
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de ficheiros por seguir '%s'"
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
msgid "--long and -z are incompatible"
msgstr "--long e -z são incompatíveis"
-#: builtin/commit.c:1219
+#: builtin/commit.c:1226
#, 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
+#: builtin/commit.c:1228
#, 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
+#: builtin/commit.c:1231
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
msgstr ""
-#: builtin/commit.c:1226
+#: builtin/commit.c:1233
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
msgstr ""
-#: builtin/commit.c:1245
+#: builtin/commit.c:1252
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author e --author faz sentido nenhum"
-#: builtin/commit.c:1254
+#: builtin/commit.c:1261
msgid "You have nothing to amend."
msgstr "Tens nada para emendar."
-#: builtin/commit.c:1257
+#: builtin/commit.c:1264
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás no meio de junção -- incapaz emendar."
-#: builtin/commit.c:1259
+#: builtin/commit.c:1266
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:1261
+#: builtin/commit.c:1268
#, fuzzy
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "Estás no meio de rebase -- incapaz emendar."
-#: builtin/commit.c:1264
+#: builtin/commit.c:1271
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opções --squash e --fixup incapaz serem usadas juntas"
-#: builtin/commit.c:1274
+#: builtin/commit.c:1281
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:1276
+#: builtin/commit.c:1283
#, 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:1285
+#: builtin/commit.c:1292
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:1303
+#: builtin/commit.c:1310
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:1331
+#: builtin/commit.c:1338
#, fuzzy, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "desconheço opção: %s\n"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1352
#, fuzzy, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' com -a faz sentido nenhum"
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1483 builtin/commit.c:1652
msgid "show status concisely"
msgstr "mostrar status de forma concisa"
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show branch information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1487
#, fuzzy
msgid "show stash information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1489 builtin/commit.c:1656
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1484
+#: builtin/commit.c:1491
msgid "version"
msgstr "versão"
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
msgid "machine-readable output"
msgstr "saída inteligível por máquina"
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1494 builtin/commit.c:1660
msgid "show status in long format (default)"
msgstr "apresentar status em formato longo (predefinição)"
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1497 builtin/commit.c:1663
msgid "terminate entries with NUL"
msgstr "terminar entradas com NUL"
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
+#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
#: 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:1493 builtin/commit.c:1656
+#: builtin/commit.c:1500 builtin/commit.c:1666
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar ficheiros por seguir, modo opcional: all, normal, no. (Predefinição: "
"all)"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1504
#, fuzzy
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
@@ -13934,11 +13996,11 @@ msgstr ""
"mostrar ficheiros ignorados, modo opcional: traditional, matching, no. "
"(Predefinição: tradicional)"
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1506 parse-options.h:193
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1507
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13946,196 +14008,196 @@ msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1509
msgid "list untracked files in columns"
msgstr "listar ficheiros por seguir em colunas"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1510
#, fuzzy
msgid "do not detect renames"
msgstr "detecção renomeação nenhuma"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1512
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1525
+#: builtin/commit.c:1535
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1607
+#: builtin/commit.c:1617
msgid "suppress summary after successful commit"
msgstr "suprimir o resumo depois de submeter com sucesso"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1618
msgid "show diff in commit message template"
msgstr "mostrar diff no modelo da mensagem de commit"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1620
msgid "Commit message options"
msgstr "Opções de mensagem de commit"
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
msgid "read message from file"
msgstr "ler mensagem de um ficheiro"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1622
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1622
msgid "override author for commit"
msgstr "substituir autor do commit"
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1623 builtin/gc.c:550
msgid "date"
msgstr "data"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1623
msgid "override date for commit"
msgstr "substituir data do commit"
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
#: parse-options.h:329 ref-filter.h:90
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1625
msgid "reuse and edit message from specified commit"
msgstr "reutilizar e editar a mensagem de um commit especificado"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1626
msgid "reuse message from specified commit"
msgstr "reutilizar a mensagem de um commit especificado"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1621
+#: builtin/commit.c:1631
#, fuzzy
msgid "[(amend|reword):]commit"
msgstr "emendar o commit anterior"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1631
#, 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:1622
+#: builtin/commit.c:1632
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar mensagem com formato autosquash para esmagar o commit especificado"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1633
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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "terminador"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1634
msgid "add custom trailer(s)"
msgstr ""
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
+#: builtin/commit.c:1635 builtin/log.c:1754 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:1626
+#: builtin/commit.c:1636
msgid "use specified template file"
msgstr "usar ficheiro de modelo especificado"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1637
msgid "force edit of commit"
msgstr "forçar edição do commit"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1639
msgid "include status in commit message template"
msgstr "incluir status no modelo da mensagem de commit"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1644
msgid "Commit contents options"
msgstr "Opções de conteúdo do commit"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1645
msgid "commit all changed files"
msgstr "submeter todos os ficheiros alterados"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1646
msgid "add specified files to index for commit"
msgstr "adicionar ficheiros especificados ao índice para submeter"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1647
msgid "interactively add files"
msgstr "adicionar ficheiros interativamente"
-#: builtin/commit.c:1638
+#: builtin/commit.c:1648
msgid "interactively add changes"
msgstr "adicionar alterações interativamente"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1649
msgid "commit only specified files"
msgstr "submeter somente os ficheiros especificados"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1650
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ignorar pre-commit e commit-msg hooks"
-#: builtin/commit.c:1641
+#: builtin/commit.c:1651
msgid "show what would be committed"
msgstr "mostrar o que seria submetido"
-#: builtin/commit.c:1654
+#: builtin/commit.c:1664
msgid "amend previous commit"
msgstr "emendar o commit anterior"
-#: builtin/commit.c:1655
+#: builtin/commit.c:1665
msgid "bypass post-rewrite hook"
msgstr "ignorar post-rewrite hook"
-#: builtin/commit.c:1662
+#: builtin/commit.c:1672
msgid "ok to record an empty change"
msgstr "aceitar o registo duma alteração vazia"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1674
msgid "ok to record a change with an empty message"
msgstr "aceitar o registo duma alteração com uma mensagem vazia"
-#: builtin/commit.c:1737
+#: builtin/commit.c:1747
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD roto (%s)"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1754
msgid "could not read MERGE_MODE"
msgstr "incapaz ler MERGE_MODE"
-#: builtin/commit.c:1765
+#: builtin/commit.c:1775
#, c-format
msgid "could not read commit message: %s"
msgstr "incapaz ler mensagem de commit: %s"
-#: builtin/commit.c:1772
+#: builtin/commit.c:1782
#, 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:1777
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; mensagem ficou por editar.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1798
#, 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
+#: builtin/commit.c:1834
#, fuzzy
msgid ""
"repository has been updated, but unable to write\n"
@@ -14791,37 +14853,37 @@ msgstr "existem ficheiros temporários em '%s'."
msgid "you may want to cleanup or recover these."
msgstr "pode querer limpar ou recuperá-los."
-#: builtin/difftool.c:700
+#: builtin/difftool.c:699
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use 'diff.guitool' em vez de 'diff.tool'"
-#: builtin/difftool.c:702
+#: builtin/difftool.c:701
msgid "perform a full-directory diff"
msgstr "efetuar diff diretório completo"
-#: builtin/difftool.c:704
+#: builtin/difftool.c:703
msgid "do not prompt before launching a diff tool"
msgstr "deixar de perguntar antes de lançar ferramenta diff"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:708
msgid "use symlinks in dir-diff mode"
msgstr "usar symlinks no modi dir-diff"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
#, fuzzy
msgid "tool"
msgstr "ferramenta"
-#: builtin/difftool.c:711
+#: builtin/difftool.c:710
msgid "use the specified diff tool"
msgstr "usar a ferramenta diff especificada"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
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:716
+#: builtin/difftool.c:715
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -14829,33 +14891,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:719
+#: builtin/difftool.c:718
msgid "specify a custom command for viewing diffs"
msgstr "especificar um comando personalizado para ver diffs"
-#: builtin/difftool.c:720
+#: builtin/difftool.c:719
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:735
+#: builtin/difftool.c:734
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
#, fuzzy
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dirty é incompatível com commits ou semelhantes"
-#: builtin/difftool.c:745
+#: builtin/difftool.c:744
#, fuzzy
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/difftool.c:753
+#: builtin/difftool.c:752
msgid "no <tool> given for --tool=<tool>"
msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>"
-#: builtin/difftool.c:760
+#: builtin/difftool.c:759
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "<cmd> nenhum dado a --extcmd=<cmd>"
@@ -14951,7 +15013,7 @@ msgstr "Usar a funcionalidade done para terminar o fluxo"
msgid "skip output of blob data"
msgstr "Ignorar a exibição de dados de blob"
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1222 builtin/log.c:1826
msgid "refspec"
msgstr "especificador de referência"
@@ -15267,8 +15329,8 @@ msgid "%s did not send all necessary objects\n"
msgstr "%s ficou por enviar todos objetos necessários\n"
#: builtin/fetch.c:1129
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#, fuzzy, c-format
+msgid "rejected %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:1206 builtin/fetch.c:1357
@@ -15370,59 +15432,63 @@ msgstr ""
msgid "You need to specify a tag name."
msgstr "Deve especificar um nome para a tag."
-#: builtin/fetch.c:1995
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr ""
+
+#: builtin/fetch.c:1998
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidade negativa em --deepen tem suporte nenhum"
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2000
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/fetch.c:2002
+#: builtin/fetch.c:2005
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow incapazes serem usados juntos"
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2007
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow num repositório completo faz sentido nenhum"
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2024
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all leva como argumento repositório nenhum"
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2026
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all com refspecs, faz sentido nenhum"
-#: builtin/fetch.c:2032
+#: builtin/fetch.c:2035
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Remoto ou grupo remoto inexistente: %s"
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2042
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Buscar um grupo e especificar refspecs faz sentido nenhum"
-#: builtin/fetch.c:2055
+#: builtin/fetch.c:2058
msgid "must supply remote when using --negotiate-only"
msgstr ""
-#: builtin/fetch.c:2060
+#: builtin/fetch.c:2063
msgid "Protocol does not support --negotiate-only, exiting."
msgstr ""
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2082
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2086
#, 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
+#: builtin/fetch.c:2090
#, 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"
@@ -15535,7 +15601,7 @@ msgstr ""
msgid "missing --config=<config>"
msgstr ""
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
#, fuzzy
msgid "unknown"
msgstr "desconhecido"
@@ -15552,232 +15618,232 @@ msgstr "erro em %s %s: %s"
msgid "warning in %s %s: %s"
msgstr "aviso em %s %s: %s"
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
#, c-format
msgid "broken link from %7s %s"
msgstr ""
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
#, fuzzy
msgid "wrong object type in link"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
#, fuzzy, c-format
msgid "missing %s %s"
msgstr "falta o objeto %s de %s"
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
#, fuzzy, c-format
msgid "unreachable %s %s"
msgstr "já se tem %s (%s)"
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
#, fuzzy, c-format
msgid "dangling %s %s"
msgstr "balanceando %s %s"
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
#, fuzzy
msgid "could not create lost-found"
msgstr "incapaz criar lost-found"
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
#, fuzzy, c-format
msgid "could not finish '%s'"
msgstr "incapaz acabar '%s'"
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
#, fuzzy, c-format
msgid "Checking %s"
msgstr "A verificar objetos"
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
#, fuzzy, c-format
msgid "Checking connectivity (%d objects)"
msgstr "A verificar conectividade"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, fuzzy, c-format
msgid "Checking %s %s"
msgstr "A verificar o patch %s..."
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
msgid "broken links"
msgstr ""
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
#, fuzzy, c-format
msgid "root %s"
msgstr "raiz"
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
#, c-format
msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
#, fuzzy, c-format
msgid "%s: invalid reflog entry %s"
msgstr "referência inválida: %s"
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
#, fuzzy, c-format
msgid "Checking reflog %s->%s"
msgstr "Verificando reflog %s->%s"
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "linha rasa inválida: %s"
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
#, fuzzy, c-format
msgid "%s: not a commit"
msgstr "%s: é commit nenhum"
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
#, fuzzy
msgid "notice: No default references"
msgstr "notificação: Referências padrão nenhumas"
-#: builtin/fsck.c:605
+#: builtin/fsck.c:606
#, fuzzy, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto roto ou em falta: %s"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:619
#, fuzzy, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objeto incapaz de ser processado: %s"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:639
#, fuzzy, c-format
msgid "bad sha1 file: %s"
msgstr "mau ficheiro sha1: %s"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:654
#, fuzzy
msgid "Checking object directory"
msgstr "Verificando pasta objeto"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:657
msgid "Checking object directories"
msgstr "Verificando pastas objeto"
-#: builtin/fsck.c:671
+#: builtin/fsck.c:672
#, fuzzy, c-format
msgid "Checking %s link"
msgstr "Verfificando ligação %s"
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:677 builtin/index-pack.c:864
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:683
+#: builtin/fsck.c:684
#, fuzzy, c-format
msgid "%s points to something strange (%s)"
msgstr "%s aponta para algo estranho (%s)"
-#: builtin/fsck.c:689
+#: builtin/fsck.c:690
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:693
+#: builtin/fsck.c:694
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:705
+#: builtin/fsck.c:706
#, fuzzy
msgid "Checking cache tree"
msgstr "A verificar o patch %s..."
-#: builtin/fsck.c:710
+#: builtin/fsck.c:711
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "Falha ao atualizar a árvore de cache principal"
-#: builtin/fsck.c:719
+#: builtin/fsck.c:720
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:750
+#: builtin/fsck.c:751
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opções>] [<objeto>...]"
-#: builtin/fsck.c:756
+#: builtin/fsck.c:757
msgid "show unreachable objects"
msgstr "mostrar objetos inalcançáveis"
-#: builtin/fsck.c:757
+#: builtin/fsck.c:758
msgid "show dangling objects"
msgstr "mostrar objetos suspensos"
-#: builtin/fsck.c:758
+#: builtin/fsck.c:759
msgid "report tags"
msgstr "mostrar tags"
-#: builtin/fsck.c:759
+#: builtin/fsck.c:760
msgid "report root nodes"
msgstr "mostrar nós raiz"
-#: builtin/fsck.c:760
+#: builtin/fsck.c:761
msgid "make index objects head nodes"
msgstr "considerar objetos do índice como nós cabeça"
-#: builtin/fsck.c:761
+#: builtin/fsck.c:762
msgid "make reflogs head nodes (default)"
msgstr "considerar os reflogs como nós cabeça (predefinição)"
-#: builtin/fsck.c:762
+#: builtin/fsck.c:763
msgid "also consider packs and alternate objects"
msgstr "considerar também pacotes e objetos sobressalente"
-#: builtin/fsck.c:763
+#: builtin/fsck.c:764
msgid "check only connectivity"
msgstr "verificar só a conetividade"
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:765 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "ativar verificação mais rigorosa"
-#: builtin/fsck.c:766
+#: builtin/fsck.c:767
msgid "write dangling objects in .git/lost-found"
msgstr "escrever objetos suspensos em .git/lost-found"
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:768 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progresso"
-#: builtin/fsck.c:768
+#: builtin/fsck.c:769
msgid "show verbose names for reachable objects"
msgstr "mostrar nomes verbosos de objetos inalcançáveis"
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:828 builtin/index-pack.c:262
msgid "Checking objects"
msgstr "A verificar objetos"
-#: builtin/fsck.c:855
+#: builtin/fsck.c:856
#, fuzzy, c-format
msgid "%s: object missing"
msgstr "mostrar tamanho do objeto"
-#: builtin/fsck.c:866
+#: builtin/fsck.c:867
#, fuzzy, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
@@ -16072,8 +16138,8 @@ msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3129
#, c-format
msgid "no threads support, ignoring %s"
msgstr "sem suporte de threads, %s ignorado"
@@ -16088,256 +16154,256 @@ msgstr "incapaz ler árvore (%s)"
msgid "unable to grep from object of type %s"
msgstr "incapaz efetuar grep a objetos do tipo %s"
-#: builtin/grep.c:739
+#: builtin/grep.c:738
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: builtin/grep.c:838
+#: builtin/grep.c:837
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:840
+#: builtin/grep.c:839
msgid "find in contents not managed by git"
msgstr "procurar em conteúdos fora da gestão do git"
-#: builtin/grep.c:842
+#: builtin/grep.c:841
msgid "search in both tracked and untracked files"
msgstr "procurar em ficheiros monitorizados e por monitorizar"
-#: builtin/grep.c:844
+#: builtin/grep.c:843
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:846
+#: builtin/grep.c:845
msgid "recursively search in each submodule"
msgstr "procurar recursivamente em cada submódulo"
-#: builtin/grep.c:849
+#: builtin/grep.c:848
msgid "show non-matching lines"
msgstr "mostrar linhas por corresponder"
-#: builtin/grep.c:851
+#: builtin/grep.c:850
msgid "case insensitive matching"
msgstr "correspondência insensível a maiúsculas e minúsculas"
-#: builtin/grep.c:853
+#: builtin/grep.c:852
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:855
+#: builtin/grep.c:854
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:857
+#: builtin/grep.c:856
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:860
+#: builtin/grep.c:859
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:862
+#: builtin/grep.c:861
#, fuzzy
msgid "search in subdirectories (default)"
msgstr "eliminar referências soltas (predefinição)"
-#: builtin/grep.c:864
+#: builtin/grep.c:863
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:868
+#: builtin/grep.c:867
msgid "use extended POSIX regular expressions"
msgstr "usar expressões regulares estendidas do POSIX"
-#: builtin/grep.c:871
+#: builtin/grep.c:870
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expressões regulares básicas do POSIX (predefinição)"
-#: builtin/grep.c:874
+#: builtin/grep.c:873
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:877
+#: builtin/grep.c:876
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:880
+#: builtin/grep.c:879
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:881
+#: builtin/grep.c:880
#, fuzzy
msgid "show column number of first match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:882
+#: builtin/grep.c:881
msgid "don't show filenames"
msgstr "esconder nomes de ficheiro"
-#: builtin/grep.c:883
+#: builtin/grep.c:882
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:885
+#: builtin/grep.c:884
msgid "show filenames relative to top directory"
msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
-#: builtin/grep.c:887
+#: builtin/grep.c:886
msgid "show only filenames instead of matching lines"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: builtin/grep.c:889
+#: builtin/grep.c:888
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:892
+#: builtin/grep.c:891
msgid "show only the names of files without match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:894
+#: builtin/grep.c:893
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:897
+#: builtin/grep.c:896
#, fuzzy
msgid "show only matching parts of a line"
msgstr "mostrar apenas partes da linha correspondentes"
-#: builtin/grep.c:899
+#: builtin/grep.c:898
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:900
+#: builtin/grep.c:899
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:902
+#: builtin/grep.c:901
msgid "print empty line between matches from different files"
msgstr ""
"imprimir uma linha em branco entre correspondências de diferentes ficheiros"
-#: builtin/grep.c:904
+#: builtin/grep.c:903
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:907
+#: builtin/grep.c:906
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
-#: builtin/grep.c:910
+#: builtin/grep.c:909
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:912
+#: builtin/grep.c:911
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:914
+#: builtin/grep.c:913
msgid "use <n> worker threads"
msgstr "usar <n> threads de trabalho"
-#: builtin/grep.c:915
+#: builtin/grep.c:914
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:918
+#: builtin/grep.c:917
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:920
+#: builtin/grep.c:919
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:923
+#: builtin/grep.c:922
msgid "read patterns from file"
msgstr "ler padrões do ficheiro"
-#: builtin/grep.c:925
+#: builtin/grep.c:924
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:927
+#: builtin/grep.c:926
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:939
+#: builtin/grep.c:938
msgid "indicate hit with exit status without output"
msgstr "indicar correspondência, sem output, com status de saída"
-#: builtin/grep.c:941
+#: builtin/grep.c:940
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:944
+#: builtin/grep.c:943
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:944
+#: builtin/grep.c:943
msgid "show matching files in the pager"
msgstr "mostrar ficheiros com correspondências no paginador"
-#: builtin/grep.c:948
+#: builtin/grep.c:947
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
-#: builtin/grep.c:1014
+#: builtin/grep.c:1013
#, fuzzy
msgid "no pattern given"
msgstr "fornecido pattern nenhum"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1049
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index ou --untracked incapazes serem usados em revs"
-#: builtin/grep.c:1058
+#: builtin/grep.c:1057
#, c-format
msgid "unable to resolve revision: %s"
msgstr "incapaz resolver revisão: %s"
-#: builtin/grep.c:1088
+#: builtin/grep.c:1087
#, fuzzy
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked insustentada com --recurse-submodules"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1091
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
#, fuzzy
msgid "no threads support, ignoring --threads"
msgstr "sem suporte de threads, %s ignorado"
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
-#: builtin/grep.c:1132
+#: builtin/grep.c:1131
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager só funciona na árvore de trabalho"
-#: builtin/grep.c:1158
+#: builtin/grep.c:1157
#, fuzzy
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached ou --untracked proibidos serem usados com --no-index"
-#: builtin/grep.c:1161
+#: builtin/grep.c:1160
#, fuzzy
msgid "--untracked cannot be used with --cached"
msgstr "--cached ou --untracked proibidos serem usados com --no-index"
-#: builtin/grep.c:1167
+#: builtin/grep.c:1166
#, 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:1175
+#: builtin/grep.c:1174
#, fuzzy
msgid "both --cached and trees are given"
msgstr "--cached e árvores foram fornecidos simultaneamente."
@@ -16465,30 +16531,30 @@ msgstr ""
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de manual desconhecido."
-#: builtin/help.c:453
+#: builtin/help.c:452
msgid "no man viewer handled the request"
msgstr "atendeu ao pedido visualizador de man nenhum"
-#: builtin/help.c:461
+#: builtin/help.c:459
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:348
+#: builtin/help.c:517 builtin/help.c:528 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:380
+#: builtin/help.c:531 git.c:380
#, fuzzy, c-format
msgid "bad alias.%s string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:561 builtin/help.c:591
#, c-format
msgid "usage: %s%s"
msgstr "utilização: %s%s"
-#: builtin/help.c:577
+#: builtin/help.c:575
msgid "'git help config' for more information"
msgstr ""
@@ -16526,7 +16592,7 @@ msgstr "erro de leitura da entrada"
msgid "used more bytes than were available"
msgstr "foram usados mais bytes dos que estavam disponíveis"
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:325 builtin/pack-objects.c:756
msgid "pack too large for current definition of off_t"
msgstr "pacote demasiado grande para a definição atual de off_t"
@@ -16553,240 +16619,240 @@ msgstr "assinatura de pacote faz correspondência nenhuma"
msgid "pack version %<PRIu32> unsupported"
msgstr "versão de pacote %<PRIu32> insustentada"
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:381
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:487
#, c-format
msgid "inflate returned %d"
msgstr "a descompactação retornou %d"
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:536
msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:544
msgid "delta base offset is out of bound"
msgstr "offset da base delta está fora do limite"
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:552
#, c-format
msgid "unknown object type %d"
msgstr "objeto de tipo desconhecido %d"
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:583
msgid "cannot pread pack file"
msgstr "incapaz invocar pread sobre ficheiro de pacote"
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:585
#, 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:613
+#: builtin/index-pack.c:611
msgid "serious inflate inconsistency"
msgstr "inconsistência de descompactação grave"
-#: 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
+#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
+#: builtin/index-pack.c:825 builtin/index-pack.c:834
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
#, c-format
msgid "unable to read %s"
msgstr "incapaz ler %s"
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object info %s"
msgstr "incapaz ler informação existente de objeto %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:831
#, c-format
msgid "cannot read existing object %s"
msgstr "incapaz ler objeto existente %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:845
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob inválido %s"
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
#, fuzzy
msgid "fsck error in packed object"
msgstr "ignorar objetos compactados"
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:869
#, 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:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
msgid "failed to apply delta"
msgstr "falha ao aplicar delta"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1160
msgid "Receiving objects"
msgstr "A receber objetos"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1160
msgid "Indexing objects"
msgstr "A indexar objetos"
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1194
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "pacote roto (SHA1 sem correspondência)"
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1199
msgid "cannot fstat packfile"
msgstr "incapaz fstat ficheiro de pacote"
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1202
msgid "pack has junk at the end"
msgstr "pacote com lixo no final"
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1214
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "extrema confusão em parse_pack_objects()"
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1237
msgid "Resolving deltas"
msgstr "A resolver deltas"
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
#, c-format
msgid "unable to create thread: %s"
msgstr "incapaz criar thread: %s"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1281
msgid "confusion beyond insanity"
msgstr "extrema confusão"
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1287
#, 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:1301
+#: builtin/index-pack.c:1299
#, 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:1305
+#: builtin/index-pack.c:1303
#, 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:1329
+#: builtin/index-pack.c:1327
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "incapaz descompactar objeto acrescentado (%d)"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1423
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s corrompido"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1444
#, 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:1470
+#: builtin/index-pack.c:1468
#, fuzzy, c-format
msgid "cannot write %s file '%s'"
msgstr "incapaz escrever ficheiro %s '%s'"
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1476
#, fuzzy, c-format
msgid "cannot close written %s file '%s'"
msgstr "incapaz fechar ficheiro %s gravado '%s'"
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1502
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1518
+#: builtin/index-pack.c:1516
msgid "cannot store pack file"
msgstr "incapaz guardar ficheiro de pacote"
-#: builtin/index-pack.c:1526
+#: builtin/index-pack.c:1524
msgid "cannot store index file"
msgstr "incapaz guardar ficheiro index"
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1649
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Incapaz abrir ficheiro pack existente '%s'"
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1651
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Incapaz abrir ficheiro idx existente para '%s'"
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1699
#, 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:1708
+#: builtin/index-pack.c:1706
#, 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:1750
+#: builtin/index-pack.c:1748
msgid "Cannot come back to cwd"
msgstr "Incapaz voltar a cwd"
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
+#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
#, c-format
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
#, fuzzy, c-format
msgid "unknown hash algorithm '%s'"
msgstr "Formato de arquivo desconhecido '%s'"
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1850
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin requer ser usado com --stdin"
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1852
msgid "--stdin requires a git repository"
msgstr "--stdin requer um repositório git"
-#: builtin/index-pack.c:1856
+#: builtin/index-pack.c:1854
#, fuzzy
msgid "--object-format cannot be used with --stdin"
msgstr "--object-format incapaz ser usado com --stdin"
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1869
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
#, fuzzy
msgid "fsck error in pack objects"
msgstr "erro no objeto: %s"
@@ -16831,56 +16897,56 @@ msgstr "modelos em %s por encontrar"
msgid "not copying templates from '%s': %s"
msgstr "deixando de copiar modelos de '%s': %s"
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
#, fuzzy, c-format
msgid "invalid initial branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
#, c-format
msgid "unable to handle file type %d"
msgstr "incapaz lidar com tipo de ficheiro %d"
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
#, c-format
msgid "unable to move %s to %s"
msgstr "incapaz mover %s para %s"
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
msgid "attempt to reinitialize repository with different hash"
msgstr ""
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s já existe"
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
#, c-format
msgid "re-init: ignored --initial-branch=%s"
msgstr ""
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
#, 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:463
+#: builtin/init-db.c:464
#, 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:467
+#: builtin/init-db.c:468
#, 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:468
+#: builtin/init-db.c:469
#, 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:517
+#: builtin/init-db.c:518
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -16888,44 +16954,44 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
"shared[=<permissões>]] [<diretório>]"
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
msgid "permissions"
msgstr "permissões"
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
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:550
+#: builtin/init-db.c:551
#, fuzzy
msgid "override the name of the initial branch"
msgstr "substituir o bit executável dos ficheiros listados"
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
msgid "hash"
msgstr ""
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
msgid "specify the hash algorithm to use"
msgstr ""
-#: builtin/init-db.c:559
+#: builtin/init-db.c:560
#, fuzzy
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
#, c-format
msgid "cannot mkdir %s"
msgstr "incapaz mkdir %s"
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
#, c-format
msgid "cannot chdir to %s"
msgstr "incapaz chdir para %s"
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16934,12 +17000,12 @@ msgstr ""
"%s (ou --work-tree=<diretório>) só é permitido se especificar %s (ou --git-"
"dir=<diretório>)"
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Incapaz aceder work tree '%s'"
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
#, fuzzy
msgid "--separate-git-dir incompatible with bare repository"
msgstr "--separate-git-dir incompatível com repositório nú"
@@ -17057,91 +17123,91 @@ msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path"
-#: builtin/log.c:303
+#: builtin/log.c:306
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output final: %d %s\n"
-#: builtin/log.c:568
+#: builtin/log.c:571
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ficheiro incorreto"
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:586 builtin/log.c:676
#, fuzzy, c-format
msgid "could not read object %s"
msgstr "incapaz ler objeto %s"
-#: builtin/log.c:698
+#: builtin/log.c:701
#, fuzzy, c-format
msgid "unknown type: %d"
msgstr "Tipo desconhecido: %d"
-#: builtin/log.c:843
+#: builtin/log.c:846
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:850
+#: builtin/log.c:853
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:979
+#: builtin/log.c:982
#, fuzzy, c-format
msgid "cannot open patch file %s"
msgstr "incapaz abrir ficheiro patch %s"
-#: builtin/log.c:996
+#: builtin/log.c:999
#, fuzzy
msgid "need exactly one range"
msgstr "É necessário exatamente um intervalo."
-#: builtin/log.c:1006
+#: builtin/log.c:1009
#, fuzzy
msgid "not a range"
msgstr "é intervalo nenhum"
-#: builtin/log.c:1170
+#: builtin/log.c:1173
#, fuzzy
msgid "cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
-#: builtin/log.c:1176
+#: builtin/log.c:1179
#, fuzzy
msgid "failed to create cover-letter file"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1263
+#: builtin/log.c:1266
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1290
+#: builtin/log.c:1293
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1348
+#: builtin/log.c:1351
#, fuzzy
msgid "two output directories?"
msgstr "Dois diretórios de saída?"
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
#, fuzzy, c-format
msgid "unknown commit %s"
msgstr "Commit desconhecido %s"
-#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 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:1519
+#: builtin/log.c:1522
#, fuzzy
msgid "could not find exact merge base"
msgstr "incapaz encontrar a exata base de junção."
-#: builtin/log.c:1529
+#: builtin/log.c:1532
#, fuzzy
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
@@ -17153,303 +17219,303 @@ 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:1552
+#: builtin/log.c:1555
#, fuzzy
msgid "failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
-#: builtin/log.c:1569
+#: builtin/log.c:1572
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:1579
+#: builtin/log.c:1582
msgid "base commit shouldn't be in revision list"
msgstr "commit base devia estar fora da lista de revisões"
-#: builtin/log.c:1637
+#: builtin/log.c:1640
msgid "cannot get patch id"
msgstr "incapaz obter id de patch"
-#: builtin/log.c:1700
+#: builtin/log.c:1703
#, 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:1702
+#: builtin/log.c:1705
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1746
+#: builtin/log.c:1749
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1749
+#: builtin/log.c:1752
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1753
+#: builtin/log.c:1756
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1755
+#: builtin/log.c:1758
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1757
+#: builtin/log.c:1760
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:1758
+#: builtin/log.c:1761
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1759
+#: builtin/log.c:1762
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1761
+#: builtin/log.c:1764
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:1762
+#: builtin/log.c:1765
msgid "reroll-count"
msgstr ""
-#: builtin/log.c:1763
+#: builtin/log.c:1766
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1765
+#: builtin/log.c:1768
#, fuzzy
msgid "max length of output filename"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/log.c:1767
+#: builtin/log.c:1770
#, fuzzy
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "Usar [RFC PATCH] em vez de [PATCH]"
-#: builtin/log.c:1770
+#: builtin/log.c:1773
msgid "cover-from-description-mode"
msgstr ""
-#: builtin/log.c:1771
+#: builtin/log.c:1774
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
-#: builtin/log.c:1773
+#: builtin/log.c:1776
#, fuzzy
msgid "use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1776
+#: builtin/log.c:1779
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1779
+#: builtin/log.c:1782
msgid "don't strip/add [PATCH]"
msgstr "deixar de despir/adicionar [PATCH]"
-#: builtin/log.c:1782
+#: builtin/log.c:1785
msgid "don't output binary diffs"
msgstr "deixar de gerar diffs binários"
-#: builtin/log.c:1784
+#: builtin/log.c:1787
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1786
+#: builtin/log.c:1789
msgid "don't include a patch matching a commit upstream"
msgstr "incluir nenhum patch correspondente commit upstream"
-#: builtin/log.c:1788
+#: builtin/log.c:1791
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:1790
+#: builtin/log.c:1793
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1791
+#: builtin/log.c:1794
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1792
+#: builtin/log.c:1795
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1796 builtin/log.c:1797
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1793
+#: builtin/log.c:1796
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1794
+#: builtin/log.c:1797
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1795
+#: builtin/log.c:1798
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1796
+#: builtin/log.c:1799
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)"
-#: builtin/log.c:1798
+#: builtin/log.c:1801
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1799
+#: builtin/log.c:1802
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1803 builtin/log.c:1806
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1801
+#: builtin/log.c:1804
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1804
+#: builtin/log.c:1807
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1808
+#: builtin/log.c:1811
msgid "enable message threading, styles: shallow, deep"
msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
-#: builtin/log.c:1810
+#: builtin/log.c:1813
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1811
+#: builtin/log.c:1814
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1812
+#: builtin/log.c:1815
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1813
+#: builtin/log.c:1816
msgid "add prerequisite tree info to the patch series"
msgstr "adicionar informação pré-requisito da árvore à série de patches"
-#: builtin/log.c:1816
+#: builtin/log.c:1819
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1817
+#: builtin/log.c:1820
msgid "don't print the patch filenames"
msgstr "imprimir nomes de ficheiros de patch nenhuns"
-#: builtin/log.c:1819
+#: builtin/log.c:1822
#, fuzzy
msgid "show progress while generating patches"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/log.c:1821
+#: builtin/log.c:1824
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1824
+#: builtin/log.c:1827
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1826 builtin/range-diff.c:28
+#: builtin/log.c:1829 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1913
+#: builtin/log.c:1916
#, c-format
msgid "invalid ident line: %s"
msgstr "linha de identidade inválida: %s"
-#: builtin/log.c:1928
+#: builtin/log.c:1931
#, fuzzy
msgid "-n and -k are mutually exclusive"
msgstr "-n e -k são mutuamente exclusivos."
-#: builtin/log.c:1930
+#: builtin/log.c:1933
#, fuzzy
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
-#: builtin/log.c:1938
+#: builtin/log.c:1941
msgid "--name-only does not make sense"
msgstr "--name-only faz sentido nenhum"
-#: builtin/log.c:1940
+#: builtin/log.c:1943
msgid "--name-status does not make sense"
msgstr "--name-status faz sentido nenhum"
-#: builtin/log.c:1942
+#: builtin/log.c:1945
msgid "--check does not make sense"
msgstr "--check faz sentido nenhum"
-#: builtin/log.c:1964
+#: builtin/log.c:1967
#, fuzzy
msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/log.c:2087
+#: builtin/log.c:2089
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2091
+#: builtin/log.c:2093
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:2092
+#: builtin/log.c:2094
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:2098
+#: builtin/log.c:2100
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:2102
+#: builtin/log.c:2104
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:2110
+#: builtin/log.c:2112
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:2111
+#: builtin/log.c:2113
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:2122
+#: builtin/log.c:2124
#, c-format
msgid "unable to read signature file '%s'"
msgstr "incapaz ler ficheiro de assinatura '%s'"
-#: builtin/log.c:2158
+#: builtin/log.c:2160
#, fuzzy
msgid "Generating patches"
msgstr "falha ao editar patch"
-#: builtin/log.c:2202
+#: builtin/log.c:2204
#, fuzzy
msgid "failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:2261
+#: builtin/log.c:2263
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:2315
+#: builtin/log.c:2317
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17826,14 +17892,6 @@ msgstr "Juntando %s com %s\n"
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opções>] [<commit>...]"
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
#: builtin/merge.c:123
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
@@ -17994,7 +18052,7 @@ msgstr "Lidando nada além da junção de duas heads."
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opção desconhecida de merge-recursive: -X%s"
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "incapaz escrever %s"
@@ -18303,7 +18361,7 @@ msgid ""
"larger than this size"
msgstr ""
-#: builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:179
#, fuzzy, c-format
msgid "unrecognized subcommand: %s"
msgstr "subcomando desconhecido: %s"
@@ -18845,7 +18903,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:148
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "remover nada, apenas mostrar"
@@ -18861,432 +18919,432 @@ msgstr "notes-ref"
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1034 builtin/stash.c:1735
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconhecido: %s"
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opções>...] [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-"
"objetos>]"
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
"pack %s"
msgstr ""
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
#, fuzzy, c-format
msgid "bad packed object CRC for %s"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
#, fuzzy, c-format
msgid "corrupt packed object for %s"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
#, fuzzy, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo detetado para objeto %s"
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
#, 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
+#: builtin/pack-objects.c:1155
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:1028
+#: builtin/pack-objects.c:1168
msgid "Writing objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falha ao invocar stat de %s"
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1281
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1523
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"desativando escrita bitmap, visto a incapacidade de alguns objetos serem "
"compactados"
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1971
#, 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:1840
+#: builtin/pack-objects.c:1980
#, 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:2121
+#: builtin/pack-objects.c:2261
msgid "Counting objects"
msgstr "A contar objetos"
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2426
#, fuzzy, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz processar cabeçalho de objeto de %s"
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
#, fuzzy, c-format
msgid "object %s cannot be read"
msgstr "objeto %s incapaz ser lido"
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2536
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2851
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:2990
#, 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:2916
+#: builtin/pack-objects.c:3076
msgid "Compressing objects"
msgstr "A comprimir objetos"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3082
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3161
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"hash> <uri>' (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3164
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr ""
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3199
#, 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
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
#, fuzzy, c-format
msgid "could not find pack '%s'"
msgstr "incapaz acabar '%s'"
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3378
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3384
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3482
#, fuzzy
msgid "invalid value for --missing"
msgstr "valor inválido de %s"
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
#, fuzzy
msgid "cannot open pack index"
msgstr "incapaz abrir index pack"
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3572
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3658
#, fuzzy
msgid "unable to force loose object"
msgstr "incapaz forçar objeto solto"
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3788
#, fuzzy, c-format
msgid "not a rev '%s'"
msgstr "rev '%s' nenhum"
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
#, fuzzy, c-format
msgid "bad revision '%s'"
msgstr "revisão '%s' incorreto"
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3819
#, fuzzy
msgid "unable to add recent objects"
msgstr "incapaz adicionar objetos recentes"
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3872
#, c-format
msgid "unsupported index version %s"
msgstr "versão de index %s insustentada"
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3876
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3915
#, fuzzy
msgid "<version>[,<offset>]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3916
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:3759
+#: builtin/pack-objects.c:3919
msgid "maximum size of each output pack file"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3921
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3923
msgid "ignore packed objects"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3925
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3927
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:3769
+#: builtin/pack-objects.c:3929
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:3771
+#: builtin/pack-objects.c:3931
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3933
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3935
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3937
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3939
msgid "do not create an empty pack output"
msgstr "criar output de pack vazio nenhum"
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3941
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3943
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:3786
+#: builtin/pack-objects.c:3946
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3949
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3952
msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3955
#, fuzzy
msgid "read packs from stdin"
msgstr "ler atualizações da entrada padrão"
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3957
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3959
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refiram objetos a compactar"
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3961
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3963
msgid "pack loose unreachable objects"
msgstr "empacotar objetos soltos inalcançáveis"
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3965
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <tempo>"
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3968
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3970
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3972
msgid "create packs suitable for shallow fetches"
msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3974
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3976
#, fuzzy
msgid "ignore this pack"
msgstr "usar pacote fino"
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3978
msgid "pack compression level"
msgstr "nível de compactação do pacote"
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3980
msgid "do not hide commits by grafts"
msgstr "esconder commits por enxertos nenhuns"
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3982
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:3824
+#: builtin/pack-objects.c:3984
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:3828
+#: builtin/pack-objects.c:3988
#, fuzzy
msgid "write a bitmap index if possible"
msgstr "escrever índice de mapa de bits"
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3992
#, fuzzy
msgid "handling for missing objects"
msgstr "lidando para objetos que faltem"
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3995
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3997
#, fuzzy
msgid "respect islands during delta compression"
msgstr "dimensão da janela usada em compressão de deltas"
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3999
msgid "protocol"
msgstr ""
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:4000
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr ""
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4033
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4038
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4094
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4096
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4101
#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
msgstr "incapaz usar --thin para construir pack indexável"
-#: builtin/pack-objects.c:3944
+#: builtin/pack-objects.c:4104
#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable e -A são incompatíveis"
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4110
#, fuzzy
msgid "cannot use --filter without --stdout"
msgstr "usar --filter com --stdout"
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4112
#, fuzzy
msgid "cannot use --filter with --stdin-packs"
msgstr "usar --filter com --stdout"
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4116
#, fuzzy
msgid "cannot use internal rev list with --stdin-packs"
msgstr "incapaz especificar pathnames com --stdin"
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4175
#, fuzzy
msgid "Enumerating objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4212
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19488,19 +19546,19 @@ msgid ""
"invocation.\n"
msgstr ""
-#: builtin/pull.c:991
+#: builtin/pull.c:990
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:995
+#: builtin/pull.c:994
msgid "pull with rebase"
msgstr "pull com rebase"
-#: builtin/pull.c:996
+#: builtin/pull.c:995
msgid "please commit or stash them."
msgstr "submeta ou esconda-as."
-#: builtin/pull.c:1021
+#: builtin/pull.c:1020
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -19511,7 +19569,7 @@ msgstr ""
"a avançar a árvore de trabalho a partir do\n"
"commit %s."
-#: builtin/pull.c:1027
+#: builtin/pull.c:1026
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -19528,15 +19586,15 @@ msgstr ""
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:1042
+#: builtin/pull.c:1041
msgid "Cannot merge multiple branches into empty head."
msgstr "Incapaz de juntar ramos múltiplos para head vazia."
-#: builtin/pull.c:1046
+#: builtin/pull.c:1045
msgid "Cannot rebase onto multiple branches."
msgstr "Incapaz de rebasear sobre ramos múltiplos."
-#: builtin/pull.c:1067
+#: builtin/pull.c:1065
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -19599,7 +19657,7 @@ msgstr ""
"\n"
" git push %s HEAD:<nome-de-ramo-remoto>\n"
-#: builtin/push.c:194
+#: builtin/push.c:191
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -19612,12 +19670,17 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:202
+#: builtin/push.c:199
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada."
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "Indicou refspecs nenhum para atirar, e push.default é \"nothing\"."
+
+#: builtin/push.c:243
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -19628,12 +19691,7 @@ msgstr ""
"ramo atual '%s', sem dizer-me o que atirar para atualizar\n"
"um qualquer ramo remoto."
-#: 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\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19645,7 +19703,7 @@ msgstr ""
"'git pull ...') antes de publicar de novo.\n"
"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
-#: builtin/push.c:273
+#: builtin/push.c:264
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -19657,7 +19715,7 @@ msgstr ""
"as alterações remotas (e.g. 'git pull ...') antes de publicar de novo.\n"
"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
-#: builtin/push.c:279
+#: builtin/push.c:270
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -19671,11 +19729,11 @@ msgstr ""
"de fazeres novo push.\n"
"Vê a 'Note about fast-forwards' do 'git push --help' para detalhes."
-#: builtin/push.c:286
+#: builtin/push.c:277
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "As atualizações foram rejeitadas porque a tag já existe no remoto."
-#: builtin/push.c:289
+#: builtin/push.c:280
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -19685,7 +19743,7 @@ msgstr ""
"fora de commit, ou atualizar uma ref remota fazendo-a apontar para um\n"
"objeto fora de commit, sem usar a opção '--force'.\n"
-#: builtin/push.c:294
+#: builtin/push.c:285
#, fuzzy
msgid ""
"Updates were rejected because the tip of the remote-tracking\n"
@@ -19698,104 +19756,104 @@ msgstr ""
"'git pull ...') antes de publicar de novo.\n"
"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
-#: builtin/push.c:364
+#: builtin/push.c:355
#, c-format
msgid "Pushing to %s\n"
msgstr "Fazendo push para %s\n"
-#: builtin/push.c:371
+#: builtin/push.c:362
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "falha ao publicar algumas referências em '%s'"
-#: builtin/push.c:553
+#: builtin/push.c:544
msgid "repository"
msgstr "repositório"
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:189
msgid "push all refs"
msgstr "publicar todas as referências"
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "replicar todas as referências"
-#: builtin/push.c:557
+#: builtin/push.c:548
msgid "delete refs"
msgstr "eliminar referências"
-#: builtin/push.c:558
+#: builtin/push.c:549
msgid "push tags (can't be used with --all or --mirror)"
msgstr "atirar tags (incapaz ser usado com --all ou --mirror)"
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:192
msgid "force updates"
msgstr "forçar atualização"
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:204
#, fuzzy
msgid "<refname>:<expect>"
msgstr "nome da referência>:<esperado"
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "exigir que o antigo valor da referência tenha este valor"
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:208
msgid "require remote updates to be integrated locally"
msgstr ""
-#: builtin/push.c:569
+#: builtin/push.c:560
msgid "control recursive pushing of submodules"
msgstr "controlar a publicação recursiva de submódulos"
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "usar pacote fino"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "programa receive pack"
-#: builtin/push.c:573
+#: builtin/push.c:564
msgid "set upstream for git pull/status"
msgstr "definir o ramo a montante usado com git pull/status"
-#: builtin/push.c:576
+#: builtin/push.c:567
msgid "prune locally removed refs"
msgstr "eliminar referências removidas localmente"
-#: builtin/push.c:578
+#: builtin/push.c:569
msgid "bypass pre-push hook"
msgstr "ignorar pre-push hook"
-#: builtin/push.c:579
+#: builtin/push.c:570
msgid "push missing but relevant tags"
msgstr "publicar tags perdidas mas relevantes"
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "assinar publicação com GPG"
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "solicitar transação atómica no servidor remoto"
-#: builtin/push.c:601
+#: builtin/push.c:592
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete é incompatível com --all, --mirror e --tags"
-#: builtin/push.c:603
+#: builtin/push.c:594
msgid "--delete doesn't make sense without any refs"
msgstr "--delete apenas faz sentido com uma ref"
-#: builtin/push.c:623
+#: builtin/push.c:614
#, c-format
msgid "bad repository '%s'"
msgstr "repositório '%s' incorreto"
-#: builtin/push.c:624
+#: builtin/push.c:615
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -19817,27 +19875,27 @@ msgstr ""
"\n"
" git push <nome>\n"
-#: builtin/push.c:639
+#: builtin/push.c:630
msgid "--all and --tags are incompatible"
msgstr "--all e --tags são incompatíveis"
-#: builtin/push.c:641
+#: builtin/push.c:632
msgid "--all can't be combined with refspecs"
msgstr "incapaz combinar --all com refspecs"
-#: builtin/push.c:645
+#: builtin/push.c:636
msgid "--mirror and --tags are incompatible"
msgstr "--mirror e --tags são incompatíveis"
-#: builtin/push.c:647
+#: builtin/push.c:638
msgid "--mirror can't be combined with refspecs"
msgstr "incapaz combinar --mirror com refspecs"
-#: builtin/push.c:650
+#: builtin/push.c:641
msgid "--all and --mirror are incompatible"
msgstr "--all e --mirror são incompatíveis"
-#: builtin/push.c:657
+#: builtin/push.c:648
msgid "push options must not have new line characters"
msgstr "opções de atiranço podem ter caracteres de nova linha nenhuns"
@@ -20453,7 +20511,7 @@ msgstr "Algum rebase em curso?"
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:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "Incapaz ler HEAD"
@@ -20562,8 +20620,8 @@ msgstr "Aponta nada para commit válido '%s'"
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: nenhum ramo/commit '%s'"
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
@@ -20635,7 +20693,7 @@ msgstr "Avançei-rápido %s para %s.\n"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1275
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -20665,7 +20723,7 @@ msgstr ""
"Para suprimir esta mensagem e manter o comportamento predefinido, define\n"
"a variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1295
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -20685,11 +20743,11 @@ msgstr ""
"\n"
"Para suprimir esta mensagem, podes definí-la como 'refuse'."
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2478
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:2493
+#: builtin/receive-pack.c:2492
msgid "You must specify a directory."
msgstr "Deve especificar um diretório."
@@ -21671,15 +21729,15 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
"git rerere [clear | forget <caminho>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
msgid "register clean resolutions in index"
msgstr "registar resoluções limpas no índice"
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
msgid "'git rerere forget' without paths is deprecated"
msgstr ""
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
#, fuzzy, c-format
msgid "unable to generate diff for '%s'"
msgstr "incapaz gerar diff para '%s'"
@@ -21828,19 +21886,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:538
+#: builtin/rev-list.c:541
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
msgid "rev-list does not support display of notes"
msgstr "rev-list insustenta mostrar notas"
-#: builtin/rev-list.c:664
+#: builtin/rev-list.c:679
#, fuzzy
msgid "marked counting is incompatible with --objects"
msgstr "--first-parent é incompatível com --bisect"
@@ -21861,6 +21919,20 @@ msgstr "parei de processar após o primeiro argumento diferente de opção"
msgid "output in stuck long form"
msgstr "mostrar em formato fixo e longo"
+#: builtin/rev-parse.c:438
+#, fuzzy
+msgid "premature end of input"
+msgstr "erro de leitura da entrada"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr ""
+
+#: builtin/rev-parse.c:548
+#, fuzzy
+msgid "Needed a single revision"
+msgstr "Erro ao rematar %s."
+
#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21876,6 +21948,56 @@ msgstr ""
"Execute \"git rev-parse --parseopt -h\" para mais informação com a primeira "
"utilização."
+#: builtin/rev-parse.c:712
+#, fuzzy
+msgid "--resolve-git-dir requires an argument"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/rev-parse.c:715
+#, fuzzy, c-format
+msgid "not a gitdir '%s'"
+msgstr "rev '%s' nenhum"
+
+#: builtin/rev-parse.c:739
+#, fuzzy
+msgid "--git-path requires an argument"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/rev-parse.c:749
+#, fuzzy
+msgid "-n requires an argument"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/rev-parse.c:763
+#, fuzzy
+msgid "--path-format requires an argument"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/rev-parse.c:769
+#, fuzzy, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "Valor inválido de --patch-format: %s"
+
+#: builtin/rev-parse.c:776
+#, fuzzy
+msgid "--default requires an argument"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/rev-parse.c:782
+#, fuzzy
+msgid "--prefix requires an argument"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/rev-parse.c:851
+#, fuzzy, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "valor desconhecido '%s' da chave '%s'"
+
+#: builtin/rev-parse.c:1023
+#, fuzzy, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "modo inválido para criação de objeto: %s"
+
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<opções>] <commit-etc>..."
@@ -22440,10 +22562,6 @@ msgstr ""
msgid "git stash branch <branchname> [<stash>]"
msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr ""
-
#: builtin/stash.c:30
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
@@ -22593,98 +22711,98 @@ msgstr "incluir nos arrumos ficheiros por monitorizar"
msgid "only show untracked files in the stash"
msgstr "incluir nos arrumos ficheiros por monitorizar"
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:929 builtin/stash.c:966
#, fuzzy, c-format
msgid "Cannot update %s with %s"
msgstr "Incapaz atualizar %s com %s"
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
#, fuzzy
msgid "stash message"
msgstr "mensagem da tag"
-#: builtin/stash.c:960
+#: builtin/stash.c:957
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1175
+#: builtin/stash.c:1171
msgid "No changes selected"
msgstr "Nenhuma alteração selecionada"
-#: builtin/stash.c:1275
+#: builtin/stash.c:1271
msgid "You do not have the initial commit yet"
msgstr "Commit inicial ainda é inexistente"
-#: builtin/stash.c:1302
+#: builtin/stash.c:1298
msgid "Cannot save the current index state"
msgstr "Incapaz guardar estado atual de index"
-#: builtin/stash.c:1311
+#: builtin/stash.c:1307
msgid "Cannot save the untracked files"
msgstr "Incapaz de guardar ficheiros por seguir"
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1318 builtin/stash.c:1327
msgid "Cannot save the current worktree state"
msgstr "Incapaz guardar o estado atual de worktree"
-#: builtin/stash.c:1359
+#: builtin/stash.c:1355
msgid "Cannot record working tree state"
msgstr "Incapaz gravar o estado de worktree"
-#: builtin/stash.c:1408
+#: builtin/stash.c:1404
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:1426
+#: builtin/stash.c:1422
#, fuzzy
msgid "Did you forget to 'git add'?"
msgstr "Será que falta 'git add'?"
-#: builtin/stash.c:1441
+#: builtin/stash.c:1437
msgid "No local changes to save"
msgstr "Com alterações locais para guardar nenhumas"
-#: builtin/stash.c:1448
+#: builtin/stash.c:1444
msgid "Cannot initialize stash"
msgstr "Incapaz inicializar arrumos"
-#: builtin/stash.c:1463
+#: builtin/stash.c:1459
msgid "Cannot save the current status"
msgstr "Incapaz guardar o estado atual"
-#: builtin/stash.c:1468
+#: builtin/stash.c:1464
#, 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:1558
+#: builtin/stash.c:1554
msgid "Cannot remove worktree changes"
msgstr "Incapaz remover alterações de worktree"
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1593 builtin/stash.c:1658
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: builtin/stash.c:1595 builtin/stash.c:1660
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1596 builtin/stash.c:1661
#, fuzzy
msgid "quiet mode"
msgstr "modo silencioso"
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1598 builtin/stash.c:1663
#, fuzzy
msgid "include untracked files in stash"
msgstr "incluir nos arrumos ficheiros por monitorizar"
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1600 builtin/stash.c:1665
#, fuzzy
msgid "include ignore files"
msgstr "mostrar ficheiros ignorados"
-#: builtin/stash.c:1704
+#: builtin/stash.c:1700
msgid ""
"the stash.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -22707,47 +22825,47 @@ 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:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
#, c-format
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:1820
+#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:414
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:652
#, 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:525
+#: builtin/submodule--helper.c:524
#, fuzzy, c-format
msgid "Entering '%s'\n"
msgstr "Entrando em '%s'\n"
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:527
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:549
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22755,22 +22873,22 @@ msgid ""
"."
msgstr ""
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:565
#, fuzzy
msgid "suppress output of entering each submodule command"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
#, fuzzy
msgid "recurse into nested submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:600
+#: builtin/submodule--helper.c:599
#, fuzzy, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -22779,162 +22897,163 @@ msgstr ""
"incapaz encontrar configuração '%s'. Assumindo que este repositório é o "
"próprio repositório upstream autoritário."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:666
#, 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:671
+#: builtin/submodule--helper.c:670
#, 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:681
+#: builtin/submodule--helper.c:680
#, 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:688
+#: builtin/submodule--helper.c:687
#, 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:710
+#: builtin/submodule--helper.c:709
#, fuzzy
msgid "suppress output for initializing a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
#, fuzzy
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:835
#, 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:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, fuzzy, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
#, fuzzy
msgid "suppress submodule status output"
msgstr "preceder isto ao caminho do submódulo"
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:887
#, fuzzy
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:894
+#: builtin/submodule--helper.c:893
#, fuzzy
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:989
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:992
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr ""
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:1005
#, fuzzy, c-format
msgid "%s"
msgstr "[%s]"
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1055
#, fuzzy, c-format
msgid "couldn't hash object from '%s'"
msgstr "incapaz fazer hash a objeto a partir de '%s'"
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1059
#, fuzzy, c-format
msgid "unexpected mode %o\n"
msgstr "modo inesperado %o\n"
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1300
#, 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:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr ""
+#: builtin/submodule--helper.c:1302
+#, fuzzy
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1304
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1306
#, fuzzy
msgid "limit the summary size"
msgstr "restringir-se a cabeças"
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1311
#, fuzzy
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1335
#, fuzzy
msgid "could not fetch a revision for HEAD"
msgstr "incapaz buscar uma revisão para HEAD"
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1340
#, fuzzy
msgid "--cached and --files are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1407
#, fuzzy, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url de submódulo para '%s'\n"
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1413
#, 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:1428
+#: builtin/submodule--helper.c:1427
#, 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:1439
+#: builtin/submodule--helper.c:1438
#, 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:1486
+#: builtin/submodule--helper.c:1485
#, fuzzy
msgid "suppress output of synchronizing submodule url"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1492
#, fuzzy
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:1547
+#: builtin/submodule--helper.c:1546
#, fuzzy, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -22943,7 +23062,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:1559
+#: builtin/submodule--helper.c:1558
#, fuzzy, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22952,46 +23071,46 @@ msgstr ""
"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
"use '-f' para as descartar"
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1566
#, fuzzy, c-format
msgid "Cleared directory '%s'\n"
msgstr "Pasta '%s' limpa\n"
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1568
#, 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:1580
+#: builtin/submodule--helper.c:1579
#, fuzzy, c-format
msgid "could not create empty submodule directory %s"
msgstr "incapaz criar pasta vazio de submódulo %s"
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1595
#, 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:1625
+#: builtin/submodule--helper.c:1624
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1625
#, fuzzy
msgid "unregister all submodules"
msgstr "percorrer submódulos recursivamente"
-#: builtin/submodule--helper.c:1631
+#: builtin/submodule--helper.c:1630
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1645
+#: builtin/submodule--helper.c:1644
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:1714
+#: builtin/submodule--helper.c:1713
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"
@@ -22999,47 +23118,47 @@ msgid ""
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' incapaz adicionar alternativo: %s"
-#: builtin/submodule--helper.c:1792
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível"
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível"
-#: builtin/submodule--helper.c:1823
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "forçar progresso da clonagem"
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
#, fuzzy
msgid "disallow cloning into non-empty directory"
msgstr "a aplicar a um histórico vazio"
-#: builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:1848
#, fuzzy
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
@@ -23049,106 +23168,106 @@ msgstr ""
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:1874
+#: builtin/submodule--helper.c:1873
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:1884
#, 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:1889
+#: builtin/submodule--helper.c:1888
#, fuzzy, c-format
msgid "directory not empty: '%s'"
msgstr "pasta com conteúdo: '%s'"
-#: builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "incapaz obter pasta de submódulo para '%s'"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1936
#, 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:1941
+#: builtin/submodule--helper.c:1940
#, 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:2042
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Path de submódulo '%s' por inicializar"
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendias usar 'update --init'?"
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Passando à frente submódulo por juntar %s"
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Passando à frente submódulo '%s'"
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "caminho para a árvore de trabalho"
-#: builtin/submodule--helper.c:2331
+#: builtin/submodule--helper.c:2330
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:2335
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:2341
+#: builtin/submodule--helper.c:2340
#, 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:2344
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "trabalhos em paralelo"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2345
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:2347
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "imprimir progresso da clonagem nenhum"
-#: builtin/submodule--helper.c:2358
+#: builtin/submodule--helper.c:2357
#, fuzzy
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "valor incorreto no parâmetro update"
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23157,97 +23276,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:2542
+#: builtin/submodule--helper.c:2541
#, 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:2575
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "percorrer recursivamente submódulos"
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2580
#, fuzzy
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<caminho>...]"
-#: builtin/submodule--helper.c:2637
+#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2639
#, fuzzy
msgid "unset the config in the .gitmodules file"
msgstr "falha ao preparar .gitmodules atualizado"
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2644
#, fuzzy
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2645
#, fuzzy
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2646
#, fuzzy
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
+#: builtin/submodule--helper.c:2665 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:2682
+#: builtin/submodule--helper.c:2681
#, fuzzy
msgid "suppress output for setting url of a submodule"
msgstr "Suprimir a saída ao inicializar um submódulo"
-#: builtin/submodule--helper.c:2686
+#: builtin/submodule--helper.c:2685
#, fuzzy
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper init [<caminho>]"
-#: builtin/submodule--helper.c:2719
+#: builtin/submodule--helper.c:2718
#, fuzzy
msgid "set the default tracking branch to master"
msgstr "mostrar os ramos de monitorização remotos"
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2720
#, fuzzy
msgid "set the default tracking branch"
msgstr "mostrar os ramos de monitorização remotos"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2724
#, fuzzy
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:2726
+#: builtin/submodule--helper.c:2725
#, 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:2733
+#: builtin/submodule--helper.c:2732
#, fuzzy
msgid "--branch or --default required"
msgstr "nome do ramo é obrigatório"
-#: builtin/submodule--helper.c:2736
+#: builtin/submodule--helper.c:2735
#, fuzzy
msgid "--branch and --default are mutually exclusive"
msgstr "--deepen e --depth são mutuamente exclusivos"
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s insustenta --super-prefix"
-#: builtin/submodule--helper.c:2799
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' é subcomando inválido de submodule--helper"
@@ -23881,7 +24000,7 @@ msgstr "git worktree lock [<opções>] <caminho>"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <caminho>"
-#: builtin/worktree.c:61 builtin/worktree.c:935
+#: builtin/worktree.c:61 builtin/worktree.c:944
#, fuzzy, c-format
msgid "failed to delete '%s'"
msgstr "falha ao executar '%s'"
@@ -23891,59 +24010,63 @@ msgstr "falha ao executar '%s'"
msgid "Removing %s/%s: %s"
msgstr "A remover %s"
-#: builtin/worktree.c:149
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "reportar árvores de trabalho podadas"
-#: builtin/worktree.c:151
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "expirar árvores de trabalho mais antigos que <tempo>"
-#: builtin/worktree.c:221
+#: builtin/worktree.c:219
#, c-format
msgid "'%s' already exists"
msgstr "'%s' já existe"
-#: builtin/worktree.c:230
+#: builtin/worktree.c:228
#, fuzzy, c-format
msgid "unusable worktree destination '%s'"
msgstr "destino '%s' de worktree inutilizável"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:233
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:237
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:288
+#: builtin/worktree.c:286
#, c-format
msgid "could not create directory of '%s'"
msgstr "incapaz criar diretório de '%s'"
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr ""
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
#, fuzzy, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Erro a eliminar ramo '%s'"
-#: builtin/worktree.c:424
+#: builtin/worktree.c:422
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:433
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
#, fuzzy, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "A preparar %s (identificador %s)"
@@ -23970,153 +24093,162 @@ msgstr "povoar a nova árvore de trabalho"
msgid "keep the new working tree locked"
msgstr "povoar a nova árvore de trabalho"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "razão de trancar"
+
+#: builtin/worktree.c:495
#, fuzzy
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurar modo de seguimento (consulte git-pull(1))"
-#: builtin/worktree.c:496
+#: builtin/worktree.c:498
#, fuzzy
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "tenta corresponder nome de novo ramo com ramo de monitorização remoto"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:506
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/worktree.c:565
+#: builtin/worktree.c:508
+#, fuzzy
+msgid "--reason requires --lock"
+msgstr "razão de trancar"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr ""
+
+#: builtin/worktree.c:574
#, fuzzy
msgid "--[no-]track can only be used if a new branch is created"
msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
-#: builtin/worktree.c:682
+#: builtin/worktree.c:691
msgid "show extended annotations and reasons, if available"
msgstr ""
-#: builtin/worktree.c:684
+#: builtin/worktree.c:693
#, fuzzy
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "expirar árvores de trabalho mais antigos que <tempo>"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:702
#, fuzzy
msgid "--verbose and --porcelain are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "razão de trancar"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' é working tree nenhuma"
-#: builtin/worktree.c:734 builtin/worktree.c:767
+#: builtin/worktree.c:743 builtin/worktree.c:776
msgid "The main working tree cannot be locked or unlocked"
msgstr "Working tree principal incapaz de ser trancada ou destrancada"
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' já está trancada, razão: %s"
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' já está trancada"
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' está destrancada"
-#: builtin/worktree.c:810
+#: builtin/worktree.c:819
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:818
+#: builtin/worktree.c:827
#, fuzzy
msgid "force move even if worktree is dirty or locked"
msgstr "forçar mover/mudar o nome mesmo que o destino exista"
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:850 builtin/worktree.c:974
#, fuzzy, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' é uma working tree principal"
-#: builtin/worktree.c:846
+#: builtin/worktree.c:855
#, fuzzy, c-format
msgid "could not figure out destination name from '%s'"
msgstr "incapaz descobrir nome de destino a partir de '%s'"
-#: builtin/worktree.c:859
+#: builtin/worktree.c:868
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:861
+#: builtin/worktree.c:870
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:864
+#: builtin/worktree.c:873
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:869
+#: builtin/worktree.c:878
#, fuzzy, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falha ao abrir '%s': %s"
-#: builtin/worktree.c:915
+#: builtin/worktree.c:924
#, fuzzy, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falha ao escrever para '%s'"
-#: builtin/worktree.c:919
+#: builtin/worktree.c:928
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:924
+#: builtin/worktree.c:933
#, fuzzy, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "falhou executar 'git status' em '%s', código %d"
-#: builtin/worktree.c:947
+#: builtin/worktree.c:956
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:970
+#: builtin/worktree.c:979
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:972
+#: builtin/worktree.c:981
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:975
+#: builtin/worktree.c:984
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
#, fuzzy, c-format
msgid "repair: %s: %s"
msgstr "%s: %s"
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
#, fuzzy, c-format
msgid "error: %s: %s"
msgstr "%s: %s"
@@ -24461,7 +24593,7 @@ msgstr ""
msgid "Could not set SSL backend to '%s': already set"
msgstr "Incapaz de definir backend SSL para '%s': já definido"
-#: http.c:2035
+#: http.c:2034
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -24511,99 +24643,100 @@ msgstr "incapaz aceder '%s': %s"
msgid "redirecting to %s"
msgstr "a redirecionar para %s "
-#: remote-curl.c:642
+#: remote-curl.c:644
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr ""
+#: remote-curl.c:656
+#, fuzzy
+msgid "remote server sent unexpected response end packet"
+msgstr "git fetch-pack: esperava-se lista rasa"
-#: remote-curl.c:724
+#: remote-curl.c:726
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:754
+#: remote-curl.c:756
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr ""
-#: remote-curl.c:756
+#: remote-curl.c:758
msgid "remote-curl: unexpected response end packet"
msgstr ""
-#: remote-curl.c:832
+#: remote-curl.c:834
#, fuzzy, c-format
msgid "RPC failed; %s"
msgstr "falha: %d"
-#: remote-curl.c:872
+#: remote-curl.c:874
#, fuzzy
msgid "cannot handle pushes this big"
msgstr "incapaz atirar algo tão grande"
-#: remote-curl.c:987
+#: remote-curl.c:989
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:991
+#: remote-curl.c:993
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1041
+#: remote-curl.c:1043
#, c-format
msgid "%d bytes of length header were received"
msgstr ""
-#: remote-curl.c:1043
+#: remote-curl.c:1045
#, c-format
msgid "%d bytes of body are still expected"
msgstr ""
-#: remote-curl.c:1132
+#: remote-curl.c:1134
#, fuzzy
msgid "dumb http transport does not support shallow capabilities"
msgstr "transporte http estúpido insustenta capacidades shallow"
-#: remote-curl.c:1147
+#: remote-curl.c:1149
#, fuzzy
msgid "fetch failed."
msgstr "falha ao executar o comando stash"
-#: remote-curl.c:1193
+#: remote-curl.c:1195
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1239 remote-curl.c:1245
#, fuzzy, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "erro de protocolo: cabeçalho de pacote incorreto"
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1257 remote-curl.c:1375
#, fuzzy, c-format
msgid "http transport does not support %s"
msgstr "transporte http insustenta %s"
-#: remote-curl.c:1291
+#: remote-curl.c:1293
#, fuzzy
msgid "git-http-push failed"
msgstr "falha ao executar o comando stash"
-#: remote-curl.c:1479
+#: remote-curl.c:1481
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1511
+#: remote-curl.c:1513
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1518
+#: remote-curl.c:1520
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1559
+#: remote-curl.c:1561
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
@@ -26366,86 +26499,86 @@ msgstr "Mode de --patch desconhecido: %s"
msgid "invalid argument %s, expecting --"
msgstr "argumento inválido %s, esperava-se --"
-#: git-send-email.perl:138
+#: git-send-email.perl:129
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "zona local difere de GMT por um intervalo diferente de minuto\n"
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "a diferença de tempo local é maior ou igual a 24 horas\n"
-#: git-send-email.perl:222
+#: git-send-email.perl:214
#, perl-format
msgid "fatal: command '%s' died with exit code %d"
msgstr ""
-#: git-send-email.perl:235
+#: git-send-email.perl:227
msgid "the editor exited uncleanly, aborting everything"
msgstr "o editor saiu com erros, abortar tudo"
-#: git-send-email.perl:321
+#: git-send-email.perl:316
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' contém uma versão intermédia do e-mail que esteve a compor.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:321
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contém o e-mail composto.\n"
-#: git-send-email.perl:419
+#: git-send-email.perl:450
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases incompatível com outras opções\n"
-#: git-send-email.perl:493
+#: git-send-email.perl:525
msgid ""
"fatal: found configuration options for 'sendmail'\n"
"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
msgstr ""
-#: git-send-email.perl:498 git-send-email.perl:700
+#: git-send-email.perl:530 git-send-email.perl:746
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Incapaz executar git format-patch fora de um repositório\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:533
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:514
+#: git-send-email.perl:546
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Campo de --suppress-cc desconhecido: '%s'\n"
-#: git-send-email.perl:545
+#: git-send-email.perl:577
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Definidição --confirm desconhecida: '%s'\n"
-#: git-send-email.perl:573
+#: git-send-email.perl:617
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "aviso: alias sendmail com aspas é insustentado: %s\n"
-#: git-send-email.perl:575
+#: git-send-email.perl:619
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "aviso: `:include:` insustentado: %s\n"
-#: git-send-email.perl:577
+#: git-send-email.perl:621
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "aviso: `/file` ou redireção `|pipe` é insustentado: %s\n"
-#: git-send-email.perl:582
+#: git-send-email.perl:626
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "aviso: linha sendmail está por reconhecer: %s\n"
-#: git-send-email.perl:666
+#: git-send-email.perl:711
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -26460,12 +26593,12 @@ msgstr ""
" * Dizendo \"./%s\" se pretende um ficheiro; ou\n"
" * Passando a opção --format-patch se pretende um intervalo de commits.\n"
-#: git-send-email.perl:687
+#: git-send-email.perl:732
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Falha ao abrir diretório %s: %s"
-#: git-send-email.perl:720
+#: git-send-email.perl:767
msgid ""
"\n"
"No patch files specified!\n"
@@ -26475,17 +26608,17 @@ msgstr ""
"Nenhum ficheiro patch especificado!\n"
"\n"
-#: git-send-email.perl:733
+#: git-send-email.perl:780
#, perl-format
msgid "No subject line in %s?"
msgstr "Nenhum linha de assunto em %s?"
-#: git-send-email.perl:743
+#: git-send-email.perl:791
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Falha ao abrir %s para escrita: %s"
-#: git-send-email.perl:754
+#: git-send-email.perl:802
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -26499,27 +26632,27 @@ msgstr ""
"\n"
"Apague o conteúdo do corpo se deseja enviar um sumário nenhum.\n"
-#: git-send-email.perl:778
+#: git-send-email.perl:826
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Falha ao abrir %s: %s"
-#: git-send-email.perl:795
+#: git-send-email.perl:843
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Falha ao abrir %s.final: %s"
-#: git-send-email.perl:838
+#: git-send-email.perl:886
msgid "Summary email is empty, skipping it\n"
msgstr "O e-mail de sumário está vazio, saltá-lo à frente\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:873
+#: git-send-email.perl:935
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Tem a certeza que quer usar <%s> [y/N]? "
-#: git-send-email.perl:928
+#: git-send-email.perl:990
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -26527,11 +26660,11 @@ msgstr ""
"Os seguintes ficheiros são 8bit, mas declaram Content-Transfer-Encoding "
"nenhum.\n"
-#: git-send-email.perl:933
+#: git-send-email.perl:995
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Que codificação 8bit se deve declarar [UTF-8]? "
-#: git-send-email.perl:941
+#: git-send-email.perl:1003
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -26544,22 +26677,22 @@ msgstr ""
"tem o assunto modelo '*** SUBJECT HERE ***'. Passe --force se pretende mesmo "
"enviar.\n"
-#: git-send-email.perl:960
+#: git-send-email.perl:1022
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Para quem devem ser enviados os e-mails (se alguém)?"
-#: git-send-email.perl:978
+#: git-send-email.perl:1040
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' expande para si próprio\n"
-#: git-send-email.perl:990
+#: git-send-email.perl:1052
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se "
"algum)? "
-#: git-send-email.perl:1048 git-send-email.perl:1056
+#: git-send-email.perl:1114 git-send-email.perl:1122
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erro: incapaz extrair endereço válido de: %s\n"
@@ -26567,16 +26700,16 @@ msgstr "erro: incapaz extrair endereço válido de: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1060
+#: git-send-email.perl:1126
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "O que fazer com este endereço? ([q]uit|[d]rop|[e]dit): "
-#: git-send-email.perl:1377
+#: git-send-email.perl:1446
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Path CA \"%s\" é inexistente"
-#: git-send-email.perl:1460
+#: git-send-email.perl:1529
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -26603,115 +26736,115 @@ msgstr ""
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1475
+#: git-send-email.perl:1544
#, fuzzy
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Enviar este e-mail? ([y]es|[n]o|[q]uit|[a]ll): "
-#: git-send-email.perl:1478
+#: git-send-email.perl:1547
msgid "Send this email reply required"
msgstr "É necessária resposta se deseja enviar este e-mail"
-#: git-send-email.perl:1506
+#: git-send-email.perl:1581
msgid "The required SMTP server is not properly defined."
msgstr "O servidor SMTP necessário está definido incorretamente."
-#: git-send-email.perl:1553
+#: git-send-email.perl:1628
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "O servidor insustenta STARTTLS! %s"
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1633 git-send-email.perl:1637
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Falhou STARTTLS! %s"
-#: git-send-email.perl:1571
+#: git-send-email.perl:1646
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-"
"debug."
-#: git-send-email.perl:1589
+#: git-send-email.perl:1664
#, perl-format
msgid "Failed to send %s\n"
msgstr "Falha ao enviar %s\n"
-#: git-send-email.perl:1592
+#: git-send-email.perl:1667
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulado-Enviado %s\n"
-#: git-send-email.perl:1592
+#: git-send-email.perl:1667
#, perl-format
msgid "Sent %s\n"
msgstr "Enviado %s\n"
-#: git-send-email.perl:1594
+#: git-send-email.perl:1669
msgid "Dry-OK. Log says:\n"
msgstr "Simulado-OK. O registo diz:\n"
-#: git-send-email.perl:1594
+#: git-send-email.perl:1669
msgid "OK. Log says:\n"
msgstr "OK. O registo diz:\n"
-#: git-send-email.perl:1606
+#: git-send-email.perl:1688
msgid "Result: "
msgstr "Resultado: "
-#: git-send-email.perl:1609
+#: git-send-email.perl:1691
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1627
+#: git-send-email.perl:1709
#, perl-format
msgid "can't open file %s"
msgstr "incapaz abrir ficheiro %s"
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: git-send-email.perl:1756 git-send-email.perl:1776
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Adicionar cc: %s da linha '%s'\n"
-#: git-send-email.perl:1680
+#: git-send-email.perl:1762
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Adicionar para: %s da linha '%s'\n"
-#: git-send-email.perl:1737
+#: git-send-email.perl:1819
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Adicionar cc: %s da linha '%s'\n"
-#: git-send-email.perl:1772
+#: git-send-email.perl:1854
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Adicionar cc: %s da linha '%s'\n"
-#: git-send-email.perl:1883
+#: git-send-email.perl:1965
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Incapaz executar '%s'"
-#: git-send-email.perl:1890
+#: git-send-email.perl:1972
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Adicionar %s: %s de: '%s'\n"
-#: git-send-email.perl:1894
+#: git-send-email.perl:1976
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falha ao fechar pipe para '%s'"
-#: git-send-email.perl:1924
+#: git-send-email.perl:2006
msgid "cannot send message as 7bit"
msgstr "incapaz enviar mensagem como 7bit"
-#: git-send-email.perl:1932
+#: git-send-email.perl:2014
msgid "invalid transfer encoding"
msgstr "codificação de transferência inválida"
-#: git-send-email.perl:1966
+#: git-send-email.perl:2051
#, fuzzy, perl-format
msgid ""
"fatal: %s: rejected by sendemail-validate hook\n"
@@ -26721,12 +26854,12 @@ msgstr ""
"fatal: %s: %s\n"
"aviso: enviado patch nenhum\n"
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "incapaz abrir %s: %s\n"
-#: git-send-email.perl:1979
+#: git-send-email.perl:2064
#, fuzzy, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
@@ -26735,13 +26868,23 @@ msgstr ""
"fatal: %s: %s\n"
"aviso: enviado patch nenhum\n"
-#: git-send-email.perl:1997
+#: git-send-email.perl:2082
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltar %s com sufixo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2001
+#: git-send-email.perl:2086
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Deseja mesmo enviar %s? [y|N]: "
+
+#, fuzzy
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "incapaz escrever pacote de separador sem estado"
+
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
+
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"