Translation on weblate is not allowed

Weblate shows this long time, so we can not translate. Is somebody working on fixing that ?

The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to the following alert:

Weblate could not merge upstream changes while updating the repository.

Rebasing (1/1)
Auto-merging po/pt.po
CONFLICT (content): Merge conflict in po/pt.po
error: could not apply 1c99f01b... Translated using Weblate (Portuguese)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply 1c99f01b... Translated using Weblate (Portuguese)
 (1)

Typical workflow for fixing merge conflicts

  1. Open an existing checkout of the upstream repository or perform a fresh one.

  2. Commit all pending changes in Weblate and lock the translation component.
    wlc commit; wlc lock

  3. Add Weblate exported repository as a remote.
    git remote add weblate https://hosted.weblate.org/git/incus/cli/ ; git remote update weblate

  4. Merge Weblate changes and resolve any conflicts.
    git merge weblate/main

  5. Rebase Weblate changes on top of upstream and resolve any conflicts.
    git rebase origin/main

  6. Push changes into upstream repository.
    git push origin main

  7. Weblate should now be able to see updated repository and you can unlock it.
    wlc pull ; wlc unlock

Check the FAQ for info on how to resolve this.

Appeared 3/17/26, 2:34:10 PM, last seen 6 часов назад

Fixed now, thanks for the info.