i18n: Lost translations from before Weblate reset

Catfriend1 / syncthing-android

Syncthing-Fork - A Syncthing Wrapper for Android.

Mozilla Public License 2.0

1.14k stars 40 forks source link

i18n: Lost translations from before Weblate reset #1053

Closed acolomb closed 7 months ago

acolomb commented 7 months ago

These commits were contained in #1033, but got lost when there were strange internal problems on Weblate. This should obviously be merged before #1033, as that one contains more recent material.

Catfriend1 commented 7 months ago

I'm not sure I did it right... So now we need #1053 and then #1033 ?

acolomb commented 7 months ago

Well... No, wrong :-(

I had outlined the easiest order in https://github.com/Catfriend1/syncthing-android/pull/1051 and https://github.com/Catfriend1/syncthing-android/pull/1052#issuecomment-1837156932. Now let's see how this can be fixed.

Catfriend1 commented 7 months ago

Should I do revert & re-merge?

acolomb commented 7 months ago

Should I do revert & re-merge?

NO! Please not. Just pushed a commit merging the main branch, without conflicts hopefully.

Catfriend1 commented 7 months ago

So this is next to be merged?

acolomb commented 7 months ago

Yes, please :-)