Unreal Engine PO files pipeline support

[3dever]

Describe the issue

I am using Weblate together with Unreal Engine via Git, and in general this setup works well. However, there is one critical issue in the workflow.

After connecting PO files to Weblate, translations can be edited, exported, and committed to the repository without problems.
But whenever I run Gather Text in Unreal Engine (which is required), Unreal rewrites all PO files in a slightly different format. After that, when I run Update / Merge in Weblate (repository maintenance), it always results in merge conflicts.

Even if I always commit changes coming from Weblate, the problem still occurs as soon as Unreal adds new strings or regenerates the PO files.
And also I dont think that fixing it mannualy each time with git console - is a good pipeline.

Will aprecciate any suggestions of fixes, since it might be a great localization solution for Unreal.

I already tried

• I've read and searched the documentation.
• I've searched for similar filed issues in this repository.

Steps to reproduce the behavior

1. Connect Weblate with Unreal engine's PO files via Git
2. Change something in Weblate
3. Gather new texts in Unreal Engine
4. Try to Update it with Rebase or merge

Expected behavior

It will be nice to find a good pipeline or improve that.

Screenshots

Log:
Rebasing (1/15)
Auto-merging Content/Localization/LoreNotes/ru/LoreNotes.po
CONFLICT (content): Merge conflict in Content/Localization/LoreNotes/ru/LoreNotes.po
error: could not apply ef3bf1398b5... Translated using Weblate
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 set advice.mergeConflict false"
Could not apply ef3bf1398b5... # Translated using Weblate

Exception traceback

How do you run Weblate?

Docker container

Weblate versions

No response

Weblate deploy checks

Additional context

No response

[nijel]

What kind of conflict is that?

Configuring wrapping width in the component settings might address it.

[3dever]

Thank you for the answer! Still can't fix it -(
Text wrapping is disabled for now. I also tried to rebase it with "Use fuzzy matching" enabled and doesn't work as well.. How to find any details about merge conflict type? A short text is "Could not rebase local branch onto remote branch"

Here is a component files settings

[nijel]

It's hard to tell what might be wrong if you don't share the actual error...

[3dever]

How and where to find it? I've shared everything from weblate logs

[nijel]

You can add Weblate as a git remote and inspect the conflict locally, see https://docs.weblate.org/en/latest/faq.html#how-to-fix-merge-conflicts-in-translations

[3dever]

So after time I'm trying to fix a problem. Updated Weblate to a latest version. Separated only PO files to new git repo. Uploading all components.
Then I trying to do next thing:

1. Translating all missing strings inside Weblate
2. Translating just 1 string inside Unreal Engine and exporting it to PO files/git
3. Trying to Update (Rebase or Merge) to Weblate and.. getting Merge conflict again:

Rebasing (1/48)
Rebasing (2/48)
Rebasing (3/48)
Rebasing (4/48)
Auto-merging UI/es/UI.po
CONFLICT (content): Merge conflict in UI/es/UI.po
error: could not apply f9a3c40... Translated using Weblate (Spanish)
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 set advice.mergeConflict false"
Could not apply f9a3c40... # Translated using Weblate (Spanish)
 (1)

Even revert is not helping to fix it. And by Unreal Engine pipeline is always needed to update PO files from engine (while gathering new strings). So I'm not really understand how to use it together yet -( will aprecciate any suggestions.

[nijel]

As asked before, can you share the actual confict? Add Weblate repository as remote and inspect the conflict locally in your checkout.

[3dever]

up