Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-po

* 'pt-PT' of github.com:git-l10n-pt-PT/git-po:
  l10n: pt_PT: v2.33.0 round 2
  l10n: pt_PT: git-po-helper update
  l10n: pt_PT: update translation table

1 files changed, 679 insertions, 752 deletions

diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1b8437e735..b09f16205a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -17,10 +17,15 @@
 #   amend                            |  emendar
 #   ancestor                         |  antepassado
 #   annotated tag                    |  etiqueta anotada
+#   archive                          |  arquivo
+#   backing store                    |  armazenamento-backup
+#   backward compatibility           |  retrocompatibilidade
 #   bare repository                  |  repositório nú
-#   bisect                           |  bifurcar
+#   bisect                           |  bisetar
+#   blame                            |  blame
 #   blob object                      |  objeto-blob
 #   branch                           |  ramo 
+#   bug                              |  bug
 #   bundle                           |  conjunto
 #   bypass                           |  desviar
 #   cache                            |  cenário
@@ -29,25 +34,28 @@
 #   checkout                         |  observar
 #   checksum                         |  checksum
 #   cherry-picking                   |  apanhar
+#   chunk                            |  fragmento
 #   clean                            |  limpa
 #   clone                            |  clone
 #   commit                           |  memorizar
 #   commit message                   |  mensagem de memória
 #   commit object                    |  objeto de memória
 #   commit-ish (also committish)     |  mnemónica
+#   committer                        |  memorizador
 #   conflict                         |  conflito
 #   core Git                         |  núcleo-Git
 #   cover letter                     |  carta de apresentação
 #   DAG                              |  DAG
 #   dangling object                  |  objeto perdido
-#   detached HEAD                    |  HEAD solta
+#   detached HEAD                    |  HEAD desanexada
 #   directory                        |  pasta
 #   dirty                            |  suja
 #   dumb HTTP protocol               |  protocolo HTTP burro
-#   evil merge                       |  junção malvada
+#   fanout                           |  fanout
 #   fast-forward                     |  avanço
 #   fetch                            |  buscar
 #   file system                      |  sistema de ficheiro
+#   fixup                            |  consertar
 #   fork                             |  ramificar
 #   Git archive                      |  repositório
 #   gitfile                          |  ficheiro-git
@@ -55,23 +63,25 @@
 #   hash                             |  hash
 #   HEAD                             |  HEAD
 #   head                             |  cabeça
-#   head ref                         |  ref-cabeça
 #   header                           |  cabeçalho
 #   hook                             |  gancho
 #   hunk                             |  pedaço
 #   index                            |  cenário
-#   index entry                      |  entrada de cenário
+#   index entry                      |  entrada do cenário
+#   init                             |  inicializar
 #   loose object                     |  objeto solto
 #   loose refs                       |  refs soltas
+#   mark                             |  marca
 #   master                           |  master
 #   merge                            |  junção 
+#   mergetag                         |  etiqueta-junção
 #   object                           |  objeto
 #   object database                  |  base dados de objeto
-#   object identifier                |  identificador de objeto
 #   object name                      |  nome de objeto
 #   object type                      |  tipo de objeto
 #   octopus                          |  polvinho
 #   origin                           |  origin
+#   overlay mode                     |  modo overlay
 #   pack                             |  pacote
 #   pack index                       |  índice de pacote
 #   packfile                         |  ficheiro-pacote
@@ -83,16 +93,21 @@
 #   plumbing                         |  nuclear
 #   porcelain                        |  porcelana
 #   precious-objects repo            |  repo de objetos preciosos
+#   promisor                         |  promissor
 #   prune                            |  podar
 #   pull                             |  agarrar
 #   push                             |  atirar
+#   range                            |  intervalo
 #   reachable                        |  acessível
 #   rebase                           |  rebasear
+#   record                           |  registo
 #   ref                              |  ref
 #   reflog                           |  registo-ref
 #   refspec                          |  espetro-ref
 #   remote                           |  remoto
 #   remote-tracking branch           |  ramo remoto de monitorização
+#   replace object                   |  objeto-substituto
+#   replace ref                      |  ref-substituto
 #   replay                           |  replay
 #   repo                             |  repo
 #   repository                       |  repositório
@@ -101,13 +116,15 @@
 #   revert                           |  reverter
 #   revision                         |  revisão
 #   rewind                           |  rebobinar
+#   root commit                      |  memória-raiz
 #   SCM                              |  SCM
 #   SHA-1                            |  SHA-1
-#   shallow repository               |  repositório raso
+#   shallow repository               |  repositório superficial
 #   signed tag                       |  etiqueta assinada
 #   smart HTTP protocol              |  protocolo HTTP esperto
+#   smudge filter                    |  filtro-mancha
 #   squash                           |  esmagar
-#   squelch                          |  suprimir
+#   squelch                          |  silenciar
 #   stage                            |  cenário
 #   stash                            |  esconderijo
 #   submodule                        |  submódulo
@@ -116,19 +133,25 @@
 #   tag                              |  etiqueta
 #   tag object                       |  objeto-etiqueta
 #   tagger                           |  etiquetador
+#   thin pack                        |  pacote-fino
+#   thread                           |  fio
+#   tip                              |  ponta
 #   topic branch                     |  ramo-tópico
 #   track                            |  monitorizar
 #   trailer                          |  atribuições
 #   tree                             |  árvore
 #   tree object                      |  objeto-árvore
 #   tree-ish (also treeish)          |  arvoredo
-#   unmerged index                   |  cenário por juntar
+#   unmerged                         |  por juntar
 #   unpack                           |  desempacotar
 #   unreachable object               |  objeto inacessível
 #   unstage                          |  desencenar
 #   upstream                         |  upstream
 #   upstream branch                  |  ramo-upstream
-#   working tree                     |  árvore de trabalho
+#   viewer                           |  visualizador
+#   wanted-ref                       |  wanted-ref
+#   working directory                |  pasta-trabalho
+#   working tree / worktree          |  árvore-trabalho
 #
 #
 #  Other translation table helper
@@ -136,26 +159,55 @@
 #   English                          |  Portuguese
 #   ---------------------------------+--------------------------------------
 #   apply                            |  submeter
+#   ahead                            |  à frente
 #   bind                             |  vincular
+#   broken                           |  quebrado
 #   call                             |  chamar
 #   chain                            |  série
 #   change                           |  alteração
+#   clobber                          |  encobrir
+#   config file                      |  ficheiro config
+#   compress                         |  comprimir
+#   corrupt                          |  rompido
+#   corrupted                        |  roto
+#   debug                            |  depurar
 #   default                          |  predefinido
+#   deflate                          |  esvaziar
 #   delete                           |  apagar
+#   deprecated                       |  obsoleto
+#   dry-run                          |  dry-run
 #   edit                             |  modificação
+#   embedded                         |  embutido
 #   feature                          |  feição
+#   fix                              |  corrigir
 #   given                            |  fornecido
 #   handle                           |  pega
 #   in progress                      |  em curso
+#   inflate                          |  insuflar
 #   named                            |  denominado
+#   nested                           |  encaixado
 #   not supported                    |  insustentado
+#   mainline                         |  principal
+#   mismatch                         |  sem correspondência
+#   overflow                         |  transbordo
 #   parse                            |  processar
 #   path                             |  caminho
-#   scan                             |  sondar
+#   register                         |  registar
+#   regular expression               |  expressão comum
+#   repack                           |  reempacotar
+#   save                             |  guardar
 #   set                              |  definir
+#   shell                            |  shell
 #   sparse                           |  disperso
 #   stat                             |  stat
+#   stream                           |  stream
+#   subdirectory                     |  subpasta
 #   support                          |  sustenta
+#   symlink                          |  ligação-simbólica
+#   template                         |  modelo
+#   timestamp                        |  carimbo cronológico
+#   token                            |  token
+#   unset                            |  desdefinir
 #   untrack                          |  desmonitorizar
 #   
 #
@@ -163,7 +215,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-03 17:06+0800\n"
+"POT-Creation-Date: 2021-08-14 07:56+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"
@@ -178,7 +230,7 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "O quê (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
+#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
 #: builtin/rebase.c:1953
 msgid "could not read index"
@@ -208,7 +260,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:3707
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
 #, fuzzy
 msgid "could not write index"
 msgstr "incapaz de escrever index"
@@ -378,9 +430,10 @@ msgstr "unstaged"
 #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
 #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
+#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "path"
@@ -977,7 +1030,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saindo devido a conflito por resolver."
 
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."
 
@@ -1750,7 +1803,7 @@ msgstr "incapaz ler %s"
 
 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
 #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: builtin/merge.c:1144
 #, c-format
 msgid "could not read '%s'"
 msgstr "incapaz ler '%s'"
@@ -1842,7 +1895,8 @@ 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:1830 builtin/submodule--helper.c:2335
+#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
+#: builtin/submodule--helper.c:2902
 msgid "repo"
 msgstr "repo"
 
@@ -2036,7 +2090,7 @@ 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:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
+#: blame.c:2820 bundle.c:224 ref-filter.c:2278 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
@@ -2404,7 +2458,6 @@ msgid "Clearing commit marks in commit graph"
 msgstr ""
 
 #: commit-graph.c:1424
-#, fuzzy
 msgid "Computing commit graph topological levels"
 msgstr ""
 
@@ -2478,7 +2531,6 @@ msgid "unable to open commit-graph chain file"
 msgstr "incapaz abrir ficheiro commit-graph chain"
 
 #: commit-graph.c:1939
-#, fuzzy
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
@@ -2690,12 +2742,11 @@ msgid "invalid key: %s"
 msgstr "chave inválida: %s"
 
 #: config.c:478
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key (newline): %s"
 msgstr ""
 
 #: config.c:511
-#, fuzzy
 msgid "empty config key"
 msgstr ""
 
@@ -2715,7 +2766,7 @@ msgid "bogus count in %s"
 msgstr "contagem falsa em %s"
 
 #: config.c:626
-#, fuzzy, c-format
+#, c-format
 msgid "too many entries in %s"
 msgstr ""
 
@@ -2725,7 +2776,7 @@ msgid "missing config key %s"
 msgstr "ficheiro config inválido %s"
 
 #: config.c:644
-#, fuzzy, c-format
+#, c-format
 msgid "missing config value %s"
 msgstr ""
 
@@ -2974,12 +3025,12 @@ msgid "could not unset '%s'"
 msgstr "incapaz desdefinir '%s'"
 
 #: config.c:3276
-#, fuzzy, c-format
+#, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
 #: config.c:3443
-#, fuzzy, c-format
+#, c-format
 msgid "missing value for '%s'"
 msgstr ""
 
@@ -3024,7 +3075,7 @@ msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
 #: connect.c:306
-#, fuzzy, c-format
+#, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 
@@ -3033,12 +3084,11 @@ msgid "repository on the other end cannot be shallow"
 msgstr ""
 
 #: connect.c:347
-#, fuzzy
 msgid "invalid packet"
 msgstr ""
 
 #: connect.c:367
-#, fuzzy, c-format
+#, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 
@@ -3048,7 +3098,7 @@ msgid "unknown object format '%s' specified by server"
 msgstr "objeto desconhecido '%s' pelo formato em servidor."
 
 #: connect.c:526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 
@@ -3070,7 +3120,7 @@ msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
 #: connect.c:757 connect.c:820
-#, fuzzy, c-format
+#, c-format
 msgid "Looking up %s ... "
 msgstr ""
 
@@ -3108,7 +3158,7 @@ msgid "unable to look up %s (%s)"
 msgstr "incapaz procurar %s (%s)"
 
 #: connect.c:830
-#, fuzzy, c-format
+#, c-format
 msgid "unknown port %s"
 msgstr ""
 
@@ -3267,7 +3317,6 @@ msgid "external filter '%s' failed"
 msgstr "filtro externo '%s' falhou"
 
 #: convert.c:826
-#, fuzzy
 msgid "unexpected filter type"
 msgstr ""
 
@@ -3275,23 +3324,23 @@ msgstr ""
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1414 convert.c:1447
-#, fuzzy, c-format
+#: convert.c:1416 convert.c:1449
+#, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: convert.c:1490
+#: convert.c:1492
 #, fuzzy, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "falha ao atualizar os ficheiros"
@@ -3402,7 +3451,7 @@ msgid "bad tree object %s"
 msgstr "objeto árvore"
 
 #: delta-islands.c:334
-#, fuzzy, c-format
+#, c-format
 msgid "failed to load island regex for '%s': %s"
 msgstr ""
 
@@ -3506,7 +3555,6 @@ 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:4637
-#, fuzzy
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr ""
 
@@ -3516,9 +3564,8 @@ msgid ""
 msgstr ""
 
 #: diff.c:4643
-#, fuzzy
 msgid ""
-"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
 "with -G and -S"
 msgstr ""
 
@@ -3533,7 +3580,7 @@ msgstr "valor de cor inválido: %.*s"
 
 #: 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
+#, c-format
 msgid "%s expects a numerical value"
 msgstr ""
 
@@ -3588,12 +3635,12 @@ msgid ""
 msgstr ""
 
 #: diff.c:5114 diff.c:5134
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument to %s"
 msgstr ""
 
 #: diff.c:5238
-#, fuzzy, c-format
+#, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr ""
 
@@ -3634,12 +3681,10 @@ msgid "generate the diff in raw format"
 msgstr ""
 
 #: diff.c:5398
-#, fuzzy
 msgid "synonym for '-p --raw'"
 msgstr ""
 
 #: diff.c:5402
-#, fuzzy
 msgid "synonym for '-p --stat'"
 msgstr ""
 
@@ -3679,12 +3724,10 @@ msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
 #: diff.c:5430
-#, fuzzy
 msgid "show only names of changed files"
 msgstr ""
 
 #: diff.c:5433
-#, fuzzy
 msgid "show only names and status of changed files"
 msgstr ""
 
@@ -3798,7 +3841,6 @@ msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
 #: diff.c:5498
-#, fuzzy
 msgid "Diff rename options"
 msgstr ""
 
@@ -3848,7 +3890,6 @@ msgid ""
 msgstr ""
 
 #: diff.c:5527
-#, fuzzy
 msgid "Diff algorithm options"
 msgstr ""
 
@@ -3857,17 +3898,14 @@ msgid "produce the smallest possible diff"
 msgstr ""
 
 #: diff.c:5532
-#, fuzzy
 msgid "ignore whitespace when comparing lines"
 msgstr ""
 
 #: diff.c:5535
-#, fuzzy
 msgid "ignore changes in amount of whitespace"
 msgstr ""
 
 #: diff.c:5538
-#, fuzzy
 msgid "ignore changes in whitespace at EOL"
 msgstr ""
 
@@ -3884,7 +3922,6 @@ msgid "<regex>"
 msgstr ""
 
 #: diff.c:5547
-#, fuzzy
 msgid "ignore changes whose all lines match <regex>"
 msgstr ""
 
@@ -3943,7 +3980,6 @@ msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
 #: diff.c:5581
-#, fuzzy
 msgid "Other diff options"
 msgstr ""
 
@@ -3998,7 +4034,6 @@ msgid "specify how differences in submodules are shown"
 msgstr ""
 
 #: diff.c:5608
-#, fuzzy
 msgid "hide 'git add -N' entries from the index"
 msgstr ""
 
@@ -4086,7 +4121,8 @@ msgstr "submeter somente os ficheiros especificados"
 #: diff.c:6298
 #, fuzzy
 msgid "exhaustive rename detection was skipped due to too many files."
-msgstr "detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
+msgstr ""
+"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
 
 #: diff.c:6301
 msgid "only found copies from modified paths due to too many files."
@@ -4106,7 +4142,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr "falha ao ler ficheiro de comando '%s'"
 
-#: diffcore-rename.c:1510
+#: diffcore-rename.c:1514
 msgid "Performing inexact rename detection"
 msgstr "Deteção de mudança de nome inexata em curso"
 
@@ -4126,50 +4162,50 @@ msgstr ""
 msgid "unrecognized pattern: '%s'"
 msgstr "padrão irreconhecível: '%s'"
 
-#: dir.c:792 dir.c:806
+#: dir.c:790 dir.c:804
 #, fuzzy, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "por reconhecer padrão negativo: '%s'"
 
-#: dir.c:824
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 
-#: dir.c:834
+#: dir.c:830
 msgid "disabling cone pattern matching"
 msgstr ""
 
-#: dir.c:1221
+#: dir.c:1214
 #, fuzzy, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "incapaz usar %s como ficheiro de exclusão"
 
-#: dir.c:2358
+#: dir.c:2351
 #, fuzzy, c-format
 msgid "could not open directory '%s'"
 msgstr "incapaz abrir pasta '%s'"
 
-#: dir.c:2660
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "falha ao obter nome e informação do kernel"
 
-#: dir.c:2784
+#: dir.c:2777
 #, fuzzy
 msgid "untracked cache is disabled on this system or location"
 msgstr "cache untracked está desativada neste sistema ou localização."
 
-#: dir.c:3617
-#, fuzzy, c-format
+#: dir.c:3610
+#, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3664 dir.c:3669
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "incapaz criar pasta para %s"
 
-#: dir.c:3698
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "incapaz migrar pasta git de '%s' para '%s'"
@@ -4194,13 +4230,13 @@ msgstr "incapaz de stat o ficheiro '%s'"
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:335
+#: environment.c:334
 #, fuzzy, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "incapaz definir GIT_DIR para '%s'"
 
 #: exec-cmd.c:363
-#, fuzzy, c-format
+#, c-format
 msgid "too many args to run %s"
 msgstr ""
 
@@ -4399,7 +4435,7 @@ msgid "error reading section header '%s'"
 msgstr ""
 
 #: fetch-pack.c:1353
-#, fuzzy, c-format
+#, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
@@ -4427,12 +4463,12 @@ msgid "error processing shallow info: %d"
 msgstr ""
 
 #: fetch-pack.c:1494
-#, fuzzy, c-format
+#, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
 #: fetch-pack.c:1499
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
@@ -4455,7 +4491,6 @@ msgid "remote did not send all necessary objects"
 msgstr "remoto faltou enviar todos objetos necessários"
 
 #: fetch-pack.c:2065
-#, fuzzy
 msgid "unexpected 'ready' from remote"
 msgstr ""
 
@@ -4745,7 +4780,7 @@ msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido"
 
 #: list-objects-filter-options.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "invalid filter-spec '%s'"
 msgstr ""
 
@@ -4816,7 +4851,7 @@ msgid "Unable to create '%s.lock': %s"
 msgstr "Incapaz de criar '%s.lock': %s"
 
 #: ls-refs.c:37
-#, fuzzy, c-format
+#, c-format
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr ""
 
@@ -4833,39 +4868,39 @@ msgstr ""
 msgid "bad action '%s' for '%s'"
 msgstr "ação inválida '%s' para '%s'"
 
-#: merge-ort.c:1228 merge-recursive.c:1206
-#, fuzzy, c-format
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
-#: merge-ort.c:1237 merge-recursive.c:1213
-#, fuzzy, c-format
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
-#: merge-ort.c:1246 merge-recursive.c:1220
+#: merge-ort.c:1587 merge-recursive.c:1215
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
-#: merge-ort.c:1256 merge-ort.c:1263
-#, fuzzy, c-format
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr ""
 
-#: merge-ort.c:1284
+#: merge-ort.c:1625
 #, fuzzy, c-format
 msgid "Failed to merge submodule %s"
 msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
 
-#: merge-ort.c:1291
-#, fuzzy, c-format
+#: merge-ort.c:1632
+#, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
 "%s\n"
 msgstr ""
 
-#: merge-ort.c:1295 merge-recursive.c:1274
+#: merge-ort.c:1636 merge-recursive.c:1269
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4876,42 +4911,42 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr ""
 
-#: merge-ort.c:1308
-#, fuzzy, c-format
+#: merge-ort.c:1649
+#, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
 
-#: merge-ort.c:1527 merge-recursive.c:1363
+#: merge-ort.c:1868 merge-recursive.c:1358
 msgid "Failed to execute internal merge"
 msgstr "Falha ao executar integração interna"
 
-#: merge-ort.c:1532 merge-recursive.c:1368
+#: merge-ort.c:1873 merge-recursive.c:1363
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Incapaz de adicionar %s à base de dados"
 
-#: merge-ort.c:1539 merge-recursive.c:1401
+#: merge-ort.c:1880 merge-recursive.c:1396
 #, c-format
 msgid "Auto-merging %s"
 msgstr "A integrar automaticamente %s"
 
-#: merge-ort.c:1678 merge-recursive.c:2123
+#: merge-ort.c:2019 merge-recursive.c:2118
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
 "implicit directory rename(s) putting the following path(s) there: %s."
 msgstr ""
 
-#: merge-ort.c:1688 merge-recursive.c:2133
+#: merge-ort.c:2029 merge-recursive.c:2128
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 "implicit directory renames tried to put these paths there: %s"
 msgstr ""
 
-#: merge-ort.c:1746
+#: merge-ort.c:2087
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4919,49 +4954,49 @@ msgid ""
 "majority of the files."
 msgstr ""
 
-#: merge-ort.c:1900 merge-recursive.c:2469
+#: merge-ort.c:2241 merge-recursive.c:2464
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 
-#: merge-ort.c:2044 merge-recursive.c:3252
+#: merge-ort.c:2385 merge-recursive.c:3247
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "moving it to %s."
 msgstr ""
 
-#: merge-ort.c:2051 merge-recursive.c:3259
+#: merge-ort.c:2392 merge-recursive.c:3254
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
 "%s; moving it to %s."
 msgstr ""
 
-#: merge-ort.c:2064 merge-recursive.c:3255
+#: merge-ort.c:2405 merge-recursive.c:3250
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
 "in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-ort.c:2072 merge-recursive.c:3262
+#: merge-ort.c:2413 merge-recursive.c:3257
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
 "was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-ort.c:2228
+#: merge-ort.c:2569
 #, fuzzy, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
 "%s->%s em %s"
 
-#: merge-ort.c:2323
+#: merge-ort.c:2664
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4969,62 +5004,62 @@ msgid ""
 "markers."
 msgstr ""
 
-#: merge-ort.c:2342 merge-ort.c:2366
+#: merge-ort.c:2683 merge-ort.c:2707
 #, fuzzy, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
 "%s"
 
-#: merge-ort.c:2819 merge-recursive.c:3013
+#: merge-ort.c:3182 merge-recursive.c:3008
 #, c-format
 msgid "cannot read object %s"
 msgstr "incapaz ler objeto %s"
 
-#: merge-ort.c:2822 merge-recursive.c:3016
+#: merge-ort.c:3185 merge-recursive.c:3011
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objeto %s é blob nenhum"
 
-#: merge-ort.c:3250
+#: merge-ort.c:3613
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr ""
 
-#: merge-ort.c:3326
+#: merge-ort.c:3689
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-ort.c:3333
+#: merge-ort.c:3696
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-ort.c:3433 merge-recursive.c:3092
+#: merge-ort.c:3796 merge-recursive.c:3087
 msgid "content"
 msgstr "conteúdo"
 
-#: merge-ort.c:3435 merge-recursive.c:3096
+#: merge-ort.c:3798 merge-recursive.c:3091
 msgid "add/add"
 msgstr "adicionar/adicionar"
 
-#: merge-ort.c:3437 merge-recursive.c:3141
+#: merge-ort.c:3800 merge-recursive.c:3136
 msgid "submodule"
 msgstr "submódulo"
 
-#: merge-ort.c:3439 merge-recursive.c:3142
+#: merge-ort.c:3802 merge-recursive.c:3137
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLITO (%s): conflito de integração em %s"
 
-#: merge-ort.c:3470
+#: merge-ort.c:3833
 #, fuzzy, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5033,7 +5068,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:3757
+#: merge-ort.c:4120
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5043,12 +5078,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:4116
-#, fuzzy, c-format
+#: merge-ort.c:4487
+#, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3707
+#: merge-ort-wrappers.c:13 merge-recursive.c:3702
 #, fuzzy, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -5058,105 +5093,105 @@ msgstr ""
 "integrar:\n"
 "%%s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
 #, fuzzy
 msgid "Already up to date."
 msgstr "Já está atualizado."
 
-#: merge-recursive.c:357
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(commit incorreto)\n"
 
-#: merge-recursive.c:380
+#: merge-recursive.c:375
 #, fuzzy, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "addinfo_cache falhou no caminho '%s'"
 
-#: merge-recursive.c:389
+#: merge-recursive.c:384
 #, fuzzy, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "addinfo_cache falhou no caminho '%s'"
 
-#: merge-recursive.c:877
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "falha ao criar o caminho '%s'%s"
 
-#: merge-recursive.c:888
+#: merge-recursive.c:883
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "A remover %s para criar espaço para o subdiretório\n"
 
-#: merge-recursive.c:902 merge-recursive.c:921
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": talvez um conflito D/F?"
 
-#: merge-recursive.c:911
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "recusando perder ficheiro untracked em '%s'"
 
-#: merge-recursive.c:952 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "incapaz ler objeto %s '%s'"
 
-#: merge-recursive.c:957
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:982
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "falhou ao abrir '%s': %s"
 
-#: merge-recursive.c:993
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "falha ao criar a ligação simbólica '%s': %s"
 
-#: merge-recursive.c:998
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "desconheço que fazer com %06o %s '%s'"
 
-#: merge-recursive.c:1228 merge-recursive.c:1240
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: merge-recursive.c:1231 merge-recursive.c:1243
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, fuzzy, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avançando submódulo %s"
 
-#: merge-recursive.c:1266
+#: merge-recursive.c:1261
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: merge-recursive.c:1270
-#, fuzzy, c-format
+#: merge-recursive.c:1265
+#, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 
-#: merge-recursive.c:1271
+#: merge-recursive.c:1266
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: merge-recursive.c:1283
+#: merge-recursive.c:1278
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
-#: merge-recursive.c:1425
+#: merge-recursive.c:1420