diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 372f4025..4d82b801 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,7 +82,14 @@ For per-platform build/signing setup, see [this article](https://mifi.no/blog/au
 - If Mac App Store / Windows Store
   - Merge `stores` into `master`
 - Bump [snap version](https://snapcraft.io/losslesscut/listing)
-- `yarn scan-i18n` to get the newest English strings and push so weblate gets them
+
+## Weblate
+
+`yarn scan-i18n` to get the newest English strings and push so Weblate gets them.
+
+Find the [latest PR](https://github.com/mifi/lossless-cut/pulls) from Weblate and **rebase+merge** it.
+
+**Warning:** Do not squash and merge (see [here why](translation.md#weblate))!
 
 ## Minimum OS version
 
diff --git a/translation.md b/translation.md
index 763df40a..10277c07 100644
--- a/translation.md
+++ b/translation.md
@@ -63,7 +63,6 @@ You can find a list of the available [`localeCode`s here](https://github.com/mif
 
 Now LosslessCut will use your language local file.
 
+## Weblate
 
-## Weblate merge
-
-Note to LosslessCut maintainers: Weblate [does not allow](https://github.com/WeblateOrg/weblate/issues/7081) any pushes to the weblate LosslessCut github repository (`https://hosted.weblate.org/git/losslesscut/losslesscut/`). This means if their repo becomes out of sync with this repo, the translations will be locked and the `master` branch here needs to be synced with their branch. This should normally not happen unless the weblate PR has been accidentally merged with rebase or squash.
+Note to LosslessCut maintainers: Weblate [does not allow](https://github.com/WeblateOrg/weblate/issues/7081) any pushes to the weblate LosslessCut github repository (`https://hosted.weblate.org/git/losslesscut/losslesscut/`). This means if their repo becomes out of sync with this repo, the translations will be locked and the `master` branch here needs to be synced with their branch. This should normally not happen unless the weblate PR has been accidentally merged with a squash commit.