search

Catfriend1 / syncthing-android

Syncthing-Fork - A Syncthing Wrapper for Android.
Mozilla Public License 2.0
1.14k stars 40 forks source link

Translations update from Hosted Weblate #1079

Closed weblate closed 6 months ago

weblate commented 6 months ago

Translations update from Hosted Weblate for Syncthing/Android app strings (fork).

It also includes following components:

Current translation status:

Weblate translation status

acolomb commented 6 months ago

@Catfriend1 This should fix the errors on Weblate because of which the components were recently locked.

The problem arises when the same translations are updated several times before the weblate PR is merged. Weblate then tries to rebase its commits onto the merged result, and the first modification does not apply cleanly anymore to the merged tree. Unfortunately, Git doesn't try to skip the commits if the end result is equal anyway. Only way to fix it is manually merging the changes (as here) and then pushing to Weblate and resetting their repo afterwards.

To further reduce these situations, try merging the weblate PR more often.

Catfriend1 commented 6 months ago

Ok, thanks