Catfriend1 / syncthing-android

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

Translations update from Hosted Weblate #1033

Closed weblate closed 10 months ago

weblate commented 11 months ago

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

It also includes following components:

Current translation status:

Weblate translation status

Catfriend1 commented 11 months ago

@acolomb

In which intervals would you recommend to merge this? Squash merge okay?

acolomb commented 11 months ago

Actually not sure. I'm just right now trying to fix whatever broke after merging the Weblate PR in the upstream repo.

Catfriend1 commented 11 months ago

@acolomb Where do those german translation changes come from? Might be that I'm too much of a creature of habit, but I would prefer to keep the German translation "as it is". I also remember that I did some "fine tuning" years ago - even if it did not exactly match the english to german translation people might expect - and honestly, got used to it as I use the app daily in my native language.

Here is an example where I don't know why "sleeping" is "deaktiviert" in the end... can we change such and similar cases back to get a "smaller PR", please?

image

acolomb commented 11 months ago

Well that's the deal with sharing translations between forks. I see that as a major benefit of the Weblate integration. If you want to argue about individual strings, that's best done directly on Weblate, with the other users active in the translation. In this case it's been "Masowick" making the changes, and that person is quite responsive and open to discussion.

I'd say the advantage of getting improvements to translations from the upstream app outweighs the disadvantage of losing control over a single language. You can always change the string IDs to stop the automatic propagation, but I surely wouldn't recommend it.

By the way, I'm also a native German speaker, so few of the changes are actually mine (especially those which simply bring the fork back into alignment with updated upstream translations). You might have noticed my utter desire to minimize the differences, in hope of someday merging back the fork into a better maintained official app :-)

Here's an overview of how much could be translated or improved in all the other languages by just copying from upstream: https://hosted.weblate.org/search/syncthing/android/catfriend1/fork-stringsxml/?q=check%3Ainconsistent&sort_by=-priority%2Cposition&checksum=

acolomb commented 11 months ago

Here is an example where I don't know why "sleeping" is "deaktiviert" in the end... can we change such and similar cases back to get a "smaller PR", please?

For this issue at hand, see the explanation here: https://hosted.weblate.org/translate/syncthing/android/stringsxml/de/?checksum=402f744a59e82f73#comments

And just as a general guideline: Crowd-sourcing translations means you have to trust the crowd to some extent. It's always open for discussion, but keep in mind that those are people putting in their free time completely voluntarily, for something as boring as software translation.

Catfriend1 commented 11 months ago

Ok, understood. I'll sleep some nights "about" it and then decide. Basically there are two ideas:

Maybe it's not as drama as I thought on first sighting... the Syncthing is "disabled" was the biggest shoutout I remember on the app back in 2018/2019 because of failing run conditions, it made users angry. We now have the status tab, so should be finde whatever it says. The other thing is: I am very keen on keeping some strings short (even if inaccurate to the original english wording) so the screen fits without any (time consuming) layout changes etc.

acolomb commented 11 months ago

You can always go to Weblate and suggest an improvement, which will benefit both apps hopefully. Limited screen space is also a concern for the upstream app, so your efforts will be welcomed there instead of just living in the fork.

Catfriend1 commented 11 months ago

Okay, that's welcome. Just give me some time. I still to take a calm moment to learn Weblate and what is where to participate in there correctly.

acolomb commented 10 months ago

It would help to get this PR merged from time to time, not waiting until the last moment before a release. Makes it easier to base new work on it, without causing conflicts repeatedly. That's why Weblate calls it "Continuous Localization"...

Note that you've assigned this to me, but I cannot merge it because I don't have write access to the repo.

acolomb commented 10 months ago

@Catfriend1 there was some breakage on Weblate unfortunately. Their support trying to fix a bug actually reset the translations partly. I'll need to investigate what the currently correct state is...

Catfriend1 commented 10 months ago

@acolomb thanks for informing me. No hurry, we are fine atm I think. Maybe during christmas I find some spare time to actually merge and try the new translations.

acolomb commented 10 months ago

@Catfriend1 the breakage should be fixed on Weblate's side. I've created #1053 to recover what was lost during the repair.

I'd actually be happy to get these PRs merged soon. I don't think you'll be able to judge all languages' translation changes? And just in case, there is always full Git history available to see what's changed in a specific language.

Note that in a situation like this, every day of waiting brings more potential for conflicts, because the translations are a moving target with people making changes whenever they find the time.

Catfriend1 commented 10 months ago

Ok, I'll try to do the next dev session asap :)

Catfriend1 commented 10 months ago

Ok, after this I'll try to compile it and see what lint says.

acolomb commented 10 months ago

1054 replaces this one. That's the only way I can correct the merge conflicts on Weblate without direct push access.

Catfriend1 commented 10 months ago

Ok, thanks for your work. I think we can close this .

acolomb commented 10 months ago

Yes, please close. I think Weblate is happy again.