Skip to content

Fix translation conflicts

Otto Richter requested to merge veloren/dev/veloren:weblate-translation into master
  • By opening this merge request, you agree to release your code and all other changes under the GPL 3 license and to abide by the terms set by this license.
  • Migrations have been added if applicable (migrations are always necessary for removing/renaming item asset files)
  • Significant changes of this merge request have been added to the changelog.

While the last translation merge request was open, I modified some strings in Weblate. They have been committed independently of the squashed Git commits and the pull request and lead to divergent branches. This merge request manually fixes the conflicts and makes the repository state consistent with Weblate. After it is merged, Weblate probably needs to be reset and unlocked afterwards.

Reading https://docs.weblate.org/en/weblate-5.4/admin/continuous.html#avoiding-merge-conflicts-on-weblate-originated-changes, there are two potential solutions to this in the future:

  • Lock the translations while a Merge Request is open and unlock afterwards to prevent changes in parallel
  • Rely on the Weblate review feature and allow Weblate to bypass pull requests and directly push to the development branch

Merge request reports