Closed translations

[gbrea]

Hello. I have accessed the weblate page to collaborate with the translation but all languages are blocked.
The following indications appear:

Não pode reunir o repositório.

Weblate não conseguiu unir as alterações "upstream" enquanto atualizava o repositório.

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Korean)
Using index info to reconstruct a base tree...
M	data/translations/Internationalization_ko.ts
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Translated using Weblate (Indonesian)
Using index info to reconstruct a base tree...
M	data/translations/Internationalization_id.ts
Falling back to patching base and 3-way merge...
Auto-merging data/translations/Internationalization_id.ts
No changes -- Patch already applied.
Applying: Translated using Weblate (Indonesian)
Using index info to reconstruct a base tree...
M	data/translations/Internationalization_id.ts
Falling back to patching base and 3-way merge...
Auto-merging data/translations/Internationalization_id.ts
No changes -- Patch already applied.
Applying: Translated using Weblate (Indonesian)
Using index info to reconstruct a base tree...
M	data/translations/Internationalization_id.ts
Falling back to patching base and 3-way merge...
Auto-merging data/translations/Internationalization_id.ts
CONFLICT (content): Merge conflict in data/translations/Internationalization_id.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0004 Translated using Weblate (Indonesian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)

Fluxo de trabalho típico para reparar conflitos de união

    Confirmar todas as alterações pendentes em Weblate e bloquear o componente de tradução.
    wlc commit; wlc lock
    Adicionar o repositório exportado do Weblate como um repositório remoto.
    git remote add weblate https://hosted.weblate.org/git/flameshot/flameshot/ ; git remote update weblate
    Merge alterações do Weblate e resolver quaisquer conflitos.
    git merge weblate/main
    Submeter as alterações para o repositório principal.
    git push origin main
    O Weblate deveria poder agora ver o repositório atualizado e pode você pode desbloqueá-lo.
    wlc pull ; wlc unlock