AnyOldName3 f8224b29d4 Resolve merge conflicts ...

These were caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/4005

I've had to cherry-pick parts of that MR into this commit, otherwise the CI would yell at me when it noticed the location tags had gone.

2024-04-07 21:59:54 +01:00

..

components_de.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

components_fr.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

components_ru.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00

launcher_de.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

launcher_fr.ts

I guess these aren't wired up as a dependency of the build

2024-03-06 00:47:31 +00:00

launcher_ru.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00

wizard_de.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00

wizard_fr.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00

wizard_ru.ts

Resolve merge conflicts

2024-04-07 21:59:54 +01:00